summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
* Git 2.13.2v2.13.2Junio C Hamano2017-06-242-1/+18
* Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
|\
| * doc: git-reset: fix a trivial typosn/reset-doc-typofixŠtěpán Němec2017-06-151-1/+1
* | Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
|\ \
| * | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formatsSZEDER Gábor2017-06-151-2/+2
* | | Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-241-0/+17
|\ \ \
| * | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
* | | | Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2017-06-242-48/+44
|\ \ \ \
| * | | | revision.c: use skip_prefix() in handle_revision_pseudo_opt()sg/revision-parser-skip-prefixSZEDER Gábor2017-06-121-9/+9
| * | | | revision.c: use skip_prefix() in handle_revision_opt()SZEDER Gábor2017-06-121-25/+23
| * | | | revision.c: stricter parsing of '--early-output'SZEDER Gábor2017-06-121-10/+7
| * | | | revision.c: stricter parsing of '--no-{min,max}-parents'SZEDER Gábor2017-06-121-2/+2
| * | | | revision.h: turn rev_info.early_output back into an unsigned intSZEDER Gábor2017-06-121-2/+3
* | | | | Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-241-0/+42
|\ \ \ \ \
| * | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failureKyle J. McKay2017-06-121-0/+42
* | | | | | Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
|\ \ \ \ \ \
| * | | | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorbStefan Beller2017-06-041-4/+5
* | | | | | | 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 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-242-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fixPatrick Steinhardt2017-06-132-0/+19
* | | | | | | | | Merge branch 'ls/github' into maintJunio C Hamano2017-06-242-0/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Configure Git contribution guidelines for github.comls/githubLars Schneider2017-06-132-0/+26
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-241-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safetyJeff King2017-06-071-1/+7
* | | | | | | | | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-2410-147/+301
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: use blob path for blob/file diffsJeff King2017-05-242-2/+8
| * | | | | | | | | | diff: use pending "path" if it is availableJeff King2017-05-242-3/+8
| * | | | | | | | | | 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
| * | | | | | | | | | handle_revision_arg: record paths for pending objectsJeff King2017-05-241-11/+21
| * | | | | | | | | | handle_revision_arg: record modes for "a..b" endpointsJeff King2017-05-242-5/+7
| * | | | | | | | | | t4063: add tests of direct blob diffsJeff King2017-05-241-0/+91
| * | | | | | | | | | get_sha1_with_context: dynamically allocate oc->pathJeff King2017-05-245-8/+24
| * | | | | | | | | | get_sha1_with_context: always initialize oc->symlink_pathJeff King2017-05-242-1/+1
| * | | | | | | | | | sha1_name: consistently refer to object_context as "oc"Jeff King2017-05-242-3/+3
| * | | | | | | | | | handle_revision_arg: add handle_dotdot() helperJeff King2017-05-241-75/+102
| * | | | | | | | | | handle_revision_arg: hoist ".." check out of range parsingJeff King2017-05-241-14/+10
| * | | | | | | | | | handle_revision_arg: stop using "dotdot" as a generic pointerJeff King2017-05-241-14/+15
| * | | | | | | | | | handle_revision_arg: simplify commit reference lookupsJeff King2017-05-241-6/+2
| * | | | | | | | | | handle_revision_arg: reset "dotdot" consistentlyJeff King2017-05-242-0/+12
* | | | | | | | | | | Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-242-8/+53
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tagJunio C Hamano2017-03-292-10/+45
| * | | | | | | | | | name-rev: refactor logic to see if a new candidate is a better nameJunio C Hamano2017-03-291-3/+13
* | | | | | | | | | | Prepare for 2.13.2cc/subprocess-comment-fixJunio C Hamano2017-06-132-1/+38
* | | | | | | | | | | Merge branch 'ad/pull-remote-doc' into maintJunio C Hamano2017-06-131-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs: fix formatting and grammarad/pull-remote-docAdam Dinwoodie2017-06-021-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/drop-free-refspecs' into maintJunio C Hamano2017-06-131-22/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: drop free_refspecs() functionjk/drop-free-refspecsJeff King2017-06-011-22/+6
| |/ / / / / / / / / /