summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-135-1/+51
|\ \ \ \ \ \ \
| * | | | | | | usage: add NORETURN to BUG() function definitionsjk/bug-to-abortRamsay Jones2017-05-221-2/+2
| * | | | | | | config: complain about --local outside of a git repoJeff King2017-05-152-1/+4
| * | | | | | | setup_git_env: convert die("BUG") to BUG()Jeff King2017-05-152-1/+7
| * | | | | | | usage.c: add BUG() functionJeff King2017-05-152-0/+41
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/checkout-recurse-submodules' into maintJunio C Hamano2017-06-134-18/+12
|\ \ \ \ \ \ \
| * | | | | | | submodule: properly recurse for read-tree and checkoutsb/checkout-recurse-submodulesStefan Beller2017-05-044-9/+3
| * | | | | | | submodule: avoid auto-discovery in new working tree manipulator codeStefan Beller2017-05-041-3/+3
| * | | | | | | submodule_move_head: reuse child_process structure for futher commandsStefan Beller2017-05-041-6/+6
* | | | | | | | Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-073-9/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-06-072-9/+27
| * | | | | | | | sha1dc: ignore indent-with-non-tab whitespace violationsJeff King2017-06-071-0/+1
* | | | | | | | | Git 2.13.1v2.13.1Junio C Hamano2017-06-053-511/+46
* | | | | | | | | Merge branch 'ah/doc-rev-parse-short-default' into maintJunio C Hamano2017-06-052-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: rewrite description for rev-parse --shortah/doc-rev-parse-short-defaultAndreas Heiduk2017-06-012-6/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/doc-filter-branch-export-env' into maintJunio C Hamano2017-06-051-4/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: filter-branch does not require re-export of varsah/doc-filter-branch-export-envAndreas Heiduk2017-05-291-4/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'sd/t3200-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch test: fix invalid config key accesssd/t3200-typofixSahil Dua2017-05-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/t5531-update-desc' into maintJunio C Hamano2017-06-051-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5531: fix test descriptionsb/t5531-update-descStefan Beller2017-05-231-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/doc-pretty-format-fix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: fix formatting typo in pretty-formats.txtah/doc-pretty-format-fixAndreas Heiduk2017-05-231-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ah/doc-interpret-trailers-ifexists' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: fix reference to ifExists for interpret-trailersah/doc-interpret-trailers-ifexistsAndreas Heiduk2017-05-231-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag: duplicate mention of --contains should mention --no-containsÆvar Arnfjörð Bjarmason2017-05-231-1/+1
* | | | | | | | | | Merge branch 'sg/core-filemode-doc-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofixSZEDER Gábor2017-05-261-1/+1
* | | | | | | | | | | Merge branch 'tb/dedup-crlf-tests' into maintJunio C Hamano2017-06-052-187/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t0027: tests are not expensive; remove t0025tb/dedup-crlf-testsTorsten Bögershausen2017-05-102-187/+0
* | | | | | | | | | | | Merge branch 'jn/credential-doc-on-clear' into maintJunio C Hamano2017-06-051-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clearJonathan Nieder2017-05-021-10/+10
* | | | | | | | | | | | | Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2017-06-052-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-configJeff King2017-06-012-0/+17
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-057-88/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-05-227-88/+172
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/bs-is-a-dir-sep-on-windows' into maintJunio C Hamano2017-06-052-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Windows: do not treat a path with backslashes as a remote's nick namejs/bs-is-a-dir-sep-on-windowsJohannes Sixt2017-05-261-1/+6
| * | | | | | | | | | | | mingw.h: permit arguments with side effects for is_dir_sepJohannes Sixt2017-05-231-1/+5
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/alternate-ref-optim' into maintJunio C Hamano2017-06-051-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5400: avoid concurrent writes into a trace filejk/alternate-ref-optimJeff King2017-05-181-1/+4
* | | | | | | | | | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-055-13/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-185-13/+32
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-06-051-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ref-filter: resolve HEAD when parsing %(HEAD) atomJeff King2017-05-201-7/+9
* | | | | | | | | | | | | | 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