Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'jk/bug-to-abort' into maint | Junio C Hamano | 2017-06-13 | 5 | -1/+51 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | usage: add NORETURN to BUG() function definitionsjk/bug-to-abort | Ramsay Jones | 2017-05-22 | 1 | -2/+2 | |
| * | | | | | | | config: complain about --local outside of a git repo | Jeff King | 2017-05-15 | 2 | -1/+4 | |
| * | | | | | | | setup_git_env: convert die("BUG") to BUG() | Jeff King | 2017-05-15 | 2 | -1/+7 | |
| * | | | | | | | usage.c: add BUG() function | Jeff King | 2017-05-15 | 2 | -0/+41 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sb/checkout-recurse-submodules' into maint | Junio C Hamano | 2017-06-13 | 4 | -18/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | submodule: properly recurse for read-tree and checkoutsb/checkout-recurse-submodules | Stefan Beller | 2017-05-04 | 4 | -9/+3 | |
| * | | | | | | | submodule: avoid auto-discovery in new working tree manipulator code | Stefan Beller | 2017-05-04 | 1 | -3/+3 | |
| * | | | | | | | submodule_move_head: reuse child_process structure for futher commands | Stefan Beller | 2017-05-04 | 1 | -6/+6 | |
* | | | | | | | | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-06-07 | 3 | -9/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | sha1dc: update from upstream | Ævar Arnfjörð Bjarmason | 2017-06-07 | 2 | -9/+27 | |
| * | | | | | | | | sha1dc: ignore indent-with-non-tab whitespace violations | Jeff King | 2017-06-07 | 1 | -0/+1 | |
* | | | | | | | | | Git 2.13.1v2.13.1 | Junio C Hamano | 2017-06-05 | 3 | -511/+46 | |
* | | | | | | | | | Merge branch 'ah/doc-rev-parse-short-default' into maint | Junio C Hamano | 2017-06-05 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | doc: rewrite description for rev-parse --shortah/doc-rev-parse-short-default | Andreas Heiduk | 2017-06-01 | 2 | -6/+7 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ah/doc-filter-branch-export-env' into maint | Junio C Hamano | 2017-06-05 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | doc: filter-branch does not require re-export of varsah/doc-filter-branch-export-env | Andreas Heiduk | 2017-05-29 | 1 | -4/+1 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'sd/t3200-typofix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | branch test: fix invalid config key accesssd/t3200-typofix | Sahil Dua | 2017-05-29 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'sb/t5531-update-desc' into maint | Junio C Hamano | 2017-06-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | t5531: fix test descriptionsb/t5531-update-desc | Stefan Beller | 2017-05-23 | 1 | -2/+2 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ah/doc-pretty-format-fix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation: fix formatting typo in pretty-formats.txtah/doc-pretty-format-fix | Andreas Heiduk | 2017-05-23 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ah/doc-interpret-trailers-ifexists' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation: fix reference to ifExists for interpret-trailersah/doc-interpret-trailers-ifexists | Andreas Heiduk | 2017-05-23 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ab/ref-filter-no-contains' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tag: duplicate mention of --contains should mention --no-contains | Ævar Arnfjörð Bjarmason | 2017-05-23 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'sg/core-filemode-doc-typofix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofix | SZEDER Gábor | 2017-05-26 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'tb/dedup-crlf-tests' into maint | Junio C Hamano | 2017-06-05 | 2 | -187/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t0027: tests are not expensive; remove t0025tb/dedup-crlf-tests | Torsten Bögershausen | 2017-05-10 | 2 | -187/+0 | |
* | | | | | | | | | | | | Merge branch 'jn/credential-doc-on-clear' into maint | Junio C Hamano | 2017-06-05 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clear | Jonathan Nieder | 2017-05-02 | 1 | -10/+10 | |
* | | | | | | | | | | | | | Merge branch 'jk/url-insteadof-config' into maint | Junio C Hamano | 2017-06-05 | 2 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-config | Jeff King | 2017-06-01 | 2 | -0/+17 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | am: handle "-h" argument earlierjk/unbreak-am-h | Jeff King | 2017-05-30 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-06-05 | 7 | -88/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | sha1dc: update from upstream | Ævar Arnfjörð Bjarmason | 2017-05-22 | 7 | -88/+172 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint | Junio C Hamano | 2017-06-05 | 2 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Windows: do not treat a path with backslashes as a remote's nick namejs/bs-is-a-dir-sep-on-windows | Johannes Sixt | 2017-05-26 | 1 | -1/+6 | |
| * | | | | | | | | | | | | mingw.h: permit arguments with side effects for is_dir_sep | Johannes Sixt | 2017-05-23 | 1 | -1/+5 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/alternate-ref-optim' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t5400: avoid concurrent writes into a trace filejk/alternate-ref-optim | Jeff King | 2017-05-18 | 1 | -1/+4 | |
* | | | | | | | | | | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint | Junio C Hamano | 2017-06-05 | 5 | -13/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eom | Brian Malehorn | 2017-05-18 | 5 | -13/+32 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-06-05 | 1 | -7/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | ref-filter: resolve HEAD when parsing %(HEAD) atom | Jeff King | 2017-05-20 | 1 | -7/+9 | |
* | | | | | | | | | | | | | | 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 hashrs/checkout-am-fix-unborn | René Scharfe | 2017-05-08 | 1 | -1/+1 |