Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | trailer: put process_trailers() options into a struct | Jeff King | 2017-08-10 | 1 | -7/+6 |
* | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+4 |
|\ | |||||
| * | gc: run pre-detach operations under lock | Jeff King | 2017-07-12 | 1 | -0/+4 |
* | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-12 | 1 | -6/+9 |
|\ \ | |||||
| * | | branch: set remote color in ref-filter branch immediately | Jeff King | 2017-07-09 | 1 | -5/+6 |
| * | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 1 | -2/+3 |
| * | | branch: only perform HEAD check for local branches | Jeff King | 2017-07-09 | 1 | -1/+2 |
* | | | Merge branch 'ks/typofix-commit-c-comment' into maint | Junio C Hamano | 2017-07-12 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | builtin/commit.c: fix a typo in the comment | Kaartic Sivaraam | 2017-07-06 | 1 | -1/+1 |
* | | | Merge branch 'jc/utf8-fprintf' into maint | Junio C Hamano | 2017-07-10 | 1 | -3/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | submodule--helper: do not call utf8_fprintf() unnecessarily | Junio C Hamano | 2017-06-28 | 1 | -3/+2 |
* | | | Merge branch 'jc/diff-tree-stale-comment' into maint | Junio C Hamano | 2017-06-24 | 1 | -3/+5 |
|\ \ \ | |||||
| * | | | diff-tree: update stale in-code comments | Junio C Hamano | 2017-06-02 | 1 | -3/+5 |
* | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-24 | 4 | -36/+42 |
|\ \ \ \ | |||||
| * | | | | diff: use blob path for blob/file diffs | Jeff King | 2017-05-24 | 1 | -1/+2 |
| * | | | | diff: use pending "path" if it is available | Jeff King | 2017-05-24 | 1 | -1/+6 |
| * | | | | diff: use the word "path" instead of "name" for blobs | Jeff King | 2017-05-24 | 1 | -7/+7 |
| * | | | | diff: pass whole pending entry in blobinfo | Jeff King | 2017-05-24 | 1 | -23/+15 |
| * | | | | get_sha1_with_context: dynamically allocate oc->path | Jeff King | 2017-05-24 | 3 | -5/+13 |
* | | | | | Merge branch 'jc/name-rev-lw-tag' into maint | Junio C Hamano | 2017-06-24 | 1 | -7/+52 |
|\ \ \ \ \ | |||||
| * | | | | | name-rev: favor describing with tags and use committer date to tiebreak | Junio C Hamano | 2017-03-29 | 1 | -9/+44 |
| * | | | | | name-rev: refactor logic to see if a new candidate is a better name | Junio C Hamano | 2017-03-29 | 1 | -3/+13 |
* | | | | | | 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-09 | 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 |