summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-241-3/+5
|\
| * diff-tree: update stale in-code commentsjc/diff-tree-stale-commentJunio C Hamano2017-06-021-3/+5
* | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-244-36/+42
|\ \
| * | diff: use blob path for blob/file diffsJeff King2017-05-241-1/+2
| * | diff: use pending "path" if it is availableJeff King2017-05-241-1/+6
| * | diff: use the word "path" instead of "name" for blobsJeff King2017-05-241-7/+7
| * | diff: pass whole pending entry in blobinfoJeff King2017-05-241-23/+15
| * | get_sha1_with_context: dynamically allocate oc->pathJeff King2017-05-243-5/+13
* | | Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-241-7/+52
|\ \ \
| * | | name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tagJunio C Hamano2017-03-291-9/+44
| * | | name-rev: refactor logic to see if a new candidate is a better nameJunio C Hamano2017-03-291-3/+13
* | | | Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-131-11/+14
|\ \ \ \
| * | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-11/+14
| | |/ / | |/| |
* | | | Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-131-0/+42
|\ \ \ \
| * | | | clean: teach clean -d to preserve ignored pathssl/clean-d-ignored-fixSamuel Lijin2017-05-241-0/+42
* | | | | Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-131-0/+3
|\ \ \ \ \
| * | | | | config: complain about --local outside of a git repoJeff King2017-05-151-0/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
|\ \ \ \ \
| * | | | | am: handle "-h" argument earlierjk/unbreak-am-hJeff King2017-05-301-0/+3
| |/ / / /
* | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \
| * | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-181-1/+1
| |/ / / /
* | | | | Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-052-2/+3
|\ \ \ \ \
| * | | | | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unbornRené Scharfe2017-05-081-1/+1
| * | | | | checkout: check return value of resolve_refdup before using hashRené Scharfe2017-05-081-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-051-1/+3
|\ \ \ \ \
| * | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-1/+3
* | | | | | Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-053-10/+18
|\ \ \ \ \ \
| * | | | | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-313-10/+18
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-2/+49
|\ \ \ \ \ \
| * | | | | | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-2/+49
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-0411-35/+69
|\ \ \ \ \ \
| * | | | | | checkout: fix memory leakjs/plug-leaksJunio C Hamano2017-05-091-0/+1
| * | | | | | show_worktree(): plug memory leakJohannes Schindelin2017-05-081-3/+5
| * | | | | | name-rev: avoid leaking memory in the `deref` caseJohannes Schindelin2017-05-081-2/+5
| * | | | | | receive-pack: plug memory leak in update()Johannes Schindelin2017-05-081-1/+3
| * | | | | | fast-export: avoid leaking memory in handle_tag()Johannes Schindelin2017-05-081-0/+2
| * | | | | | mktree: plug memory leaks reported by CoverityJohannes Schindelin2017-05-081-2/+3
| * | | | | | pack-redundant: plug memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | | | checkout: fix memory leakJohannes Schindelin2017-05-081-8/+9
| * | | | | | cat-file: fix memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | | | mailinfo & mailsplit: check for EOF while parsingJohannes Schindelin2017-05-081-0/+10
| * | | | | | difftool: address a couple of resource/memory leaksJohannes Schindelin2017-05-081-10/+23
| * | | | | | get_mail_commit_oid(): avoid resource leakJohannes Schindelin2017-05-081-9/+6
* | | | | | | Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2017-06-041-1/+5
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: disable pack reuse for object-selection optionsJeff King2017-05-091-1/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-041-20/+14
|\ \ \ \ \ \ \
| * | | | | | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfixJeff King2017-04-271-11/+9
| * | | | | | | am: simplify allocations in get_commit_info()Jeff King2017-04-271-15/+10
| * | | | | | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-271-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'jc/read-tree-empty-with-m' into maintJunio C Hamano2017-06-041-1/+1
|\ \ \ \ \ \ \
View Lorry Controller Status