Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | status: contextually notify user about an initial commit | Kaartic Sivaraam | 2017-06-22 | 1 | -0/+1 |
* | Merge branch 'tb/pull-ff-rebase-autostash' into maint | Junio C Hamano | 2017-06-13 | 1 | -11/+14 |
|\ | |||||
| * | pull: ff --rebase --autostash works in dirty repo | Tyler Brazier | 2017-06-01 | 1 | -11/+14 |
* | | Merge branch 'sl/clean-d-ignored-fix' into maint | Junio C Hamano | 2017-06-13 | 1 | -0/+42 |
|\ \ | |||||
| * | | clean: teach clean -d to preserve ignored paths | Samuel Lijin | 2017-05-24 | 1 | -0/+42 |
* | | | Merge branch 'jk/bug-to-abort' into maint | Junio C Hamano | 2017-06-13 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | config: complain about --local outside of a git repo | Jeff King | 2017-05-15 | 1 | -0/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | am: handle "-h" argument earlier | Jeff King | 2017-05-30 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | interpret-trailers: honor the cut line | Brian Malehorn | 2017-05-18 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'rs/checkout-am-fix-unborn' into maint | Junio C Hamano | 2017-06-05 | 2 | -2/+3 |
|\ \ \ | |||||
| * | | | am: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 | 1 | -1/+1 |
| * | | | checkout: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'jn/clone-add-empty-config-from-command-line' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | clone: handle empty config values in -c | Jonathan Nieder | 2017-05-02 | 1 | -1/+3 |
* | | | | Merge branch 'ab/c-translators-comment-style' into maint | Junio C Hamano | 2017-06-05 | 3 | -10/+18 |
|\ \ \ \ | |||||
| * | | | | C style: use standard style for "TRANSLATORS" comments | Ævar Arnfjörð Bjarmason | 2017-05-31 | 3 | -10/+18 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jt/push-options-doc' into maint | Junio C Hamano | 2017-06-04 | 1 | -2/+49 |
|\ \ \ \ | |||||
| * | | | | receive-pack: verify push options in cert | Jonathan Tan | 2017-05-10 | 1 | -2/+49 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'js/plug-leaks' into maint | Junio C Hamano | 2017-06-04 | 11 | -35/+69 |
|\ \ \ \ | |||||
| * | | | | checkout: fix memory leak | Junio C Hamano | 2017-05-10 | 1 | -0/+1 |
| * | | | | show_worktree(): plug memory leak | Johannes Schindelin | 2017-05-08 | 1 | -3/+5 |
| * | | | | name-rev: avoid leaking memory in the `deref` case | Johannes Schindelin | 2017-05-08 | 1 | -2/+5 |
| * | | | | receive-pack: plug memory leak in update() | Johannes Schindelin | 2017-05-08 | 1 | -1/+3 |
| * | | | | fast-export: avoid leaking memory in handle_tag() | Johannes Schindelin | 2017-05-08 | 1 | -0/+2 |
| * | | | | mktree: plug memory leaks reported by Coverity | Johannes Schindelin | 2017-05-08 | 1 | -2/+3 |
| * | | | | pack-redundant: plug memory leak | Johannes Schindelin | 2017-05-08 | 1 | -0/+1 |
| * | | | | checkout: fix memory leak | Johannes Schindelin | 2017-05-08 | 1 | -8/+9 |
| * | | | | cat-file: fix memory leak | Johannes Schindelin | 2017-05-08 | 1 | -0/+1 |
| * | | | | mailinfo & mailsplit: check for EOF while parsing | Johannes Schindelin | 2017-05-08 | 1 | -0/+10 |
| * | | | | difftool: address a couple of resource/memory leaks | Johannes Schindelin | 2017-05-08 | 1 | -10/+23 |
| * | | | | get_mail_commit_oid(): avoid resource leak | Johannes Schindelin | 2017-05-08 | 1 | -9/+6 |
* | | | | | Merge branch 'jk/disable-pack-reuse-when-broken' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: disable pack reuse for object-selection options | Jeff King | 2017-05-09 | 1 | -1/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/am-leakfix' into maint | Junio C Hamano | 2017-06-04 | 1 | -20/+14 |
|\ \ \ \ \ | |||||
| * | | | | | am: shorten ident_split variable name in get_commit_info() | Jeff King | 2017-04-27 | 1 | -11/+9 |
| * | | | | | am: simplify allocations in get_commit_info() | Jeff King | 2017-04-27 | 1 | -15/+10 |
| * | | | | | am: fix commit buffer leak in get_commit_info() | Jeff King | 2017-04-27 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/read-tree-empty-with-m' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | read-tree: "read-tree -m --empty" does not make sense | Junio C Hamano | 2017-05-11 | 1 | -1/+1 |
* | | | | | | Merge branch 'ja/do-not-ask-needless-questions' into maint | Junio C Hamano | 2017-06-04 | 3 | -7/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read-tree -m: make error message for merging 0 trees less smart aleck | Jean-Noel Avila | 2017-05-12 | 1 | -2/+3 |
| * | | | | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 | 2 | -5/+5 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ah/log-decorate-default-to-auto' into maint | Junio C Hamano | 2017-06-04 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | builtin/log: honor log.decorate | brian m. carlson | 2017-05-15 | 1 | -2/+2 |
* | | | | | | Merge branch 'ja/i18n-cleanup' | Junio C Hamano | 2017-05-04 | 1 | -6/+6 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | i18n: remove i18n from tag reflog message | Jean-Noel Avila | 2017-05-01 | 1 | -6/+6 |
* | | | | | | Merge branch 'jk/submodule-init-segv-fix' | Junio C Hamano | 2017-05-01 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | submodule_init: die cleanly on submodules without url defined | Jeff King | 2017-04-25 | 1 | -3/+3 |