Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '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 '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 | 1 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eom | Brian Malehorn | 2017-05-18 | 1 | -0/+17 |
* | | | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-line | Jonathan Nieder | 2017-05-02 | 1 | -0/+8 |
* | | | | | | | Merge branch 'jt/use-trailer-api-in-commands' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+44 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sequencer: add newline before adding footersjt/use-trailer-api-in-commands | Jonathan Tan | 2017-04-26 | 1 | -0/+44 |
* | | | | | | | | Merge branch 'jt/push-options-doc' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | receive-pack: verify push options in certjt/push-options-doc | Jonathan Tan | 2017-05-10 | 1 | -0/+37 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/eol-on-ourselves' into maint | Junio C Hamano | 2017-06-04 | 7 | -25/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselves | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| * | | | | | | | | Fix the remaining tests that failed with core.autocrlf=true | Johannes Schindelin | 2017-05-10 | 1 | -1/+20 |
| * | | | | | | | | t3901: move supporting files into t/t3901/ | Johannes Schindelin | 2017-05-10 | 6 | -24/+24 |
* | | | | | | | | | Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revision.c: ignore broken tags with ignore_missing_linksjk/ignore-broken-tags-when-ignoring-missing-links | Jeff King | 2017-05-20 | 1 | -1/+26 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/disable-pack-reuse-when-broken' into maint | Junio C Hamano | 2017-06-04 | 1 | -3/+45 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5310: fix "; do" stylejk/disable-pack-reuse-when-broken | Jeff King | 2017-05-09 | 1 | -4/+8 |
| * | | | | | | | | | pack-objects: disable pack reuse for object-selection options | Jeff King | 2017-05-09 | 1 | -0/+38 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bw/submodule-with-bs-path' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t7400: add !CYGWIN prerequisite to 'add with \\ in path'bw/submodule-with-bs-path | Ramsay Jones | 2017-05-01 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ah/log-decorate-default-to-auto' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/log: honor log.decorateah/log-decorate-default-to-auto | brian m. carlson | 2017-05-15 | 1 | -0/+12 |
* | | | | | | | | | | | Merge branch 'ab/fix-poison-tests' into maint | Junio C Hamano | 2017-06-04 | 15 | -34/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tests: fix tests broken under GETTEXT_POISON=YesPlease | Ævar Arnfjörð Bjarmason | 2017-05-11 | 15 | -34/+38 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ab/doc-replace-gmane-links' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | doc: replace more gmane linksab/doc-replace-gmane-links | Junio C Hamano | 2017-05-09 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-05-09 | 1 | -8/+26 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | t1450: avoid use of "sed" on the index, which is a binary filejh/verify-index-checksum-only-in-fsck | Jeff Hostetler | 2017-04-27 | 1 | -8/+26 |
* | | | | | | | | | | Merge branch 'sh/rebase-i-reread-todo-after-exec' | Junio C Hamano | 2017-05-01 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-exec | Stephen Hicks | 2017-04-27 | 1 | -0/+14 |
* | | | | | | | | | | | Merge branch 'jk/submodule-init-segv-fix' | Junio C Hamano | 2017-05-01 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fix | Jeff King | 2017-04-24 | 1 | -0/+8 |
* | | | | | | | | | | | | Merge branch 'ab/align-perf-descriptions' | Junio C Hamano | 2017-05-01 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | t/perf: correctly align non-ASCII descriptions in outputab/align-perf-descriptions | Ævar Arnfjörð Bjarmason | 2017-04-23 | 2 | -0/+5 |
* | | | | | | | | | | | | Merge branch 'nd/worktree-add-lock' | Junio C Hamano | 2017-04-26 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | worktree add: add --lock optionnd/worktree-add-lock | Nguyễn Thái Ngọc Duy | 2017-04-20 | 1 | -0/+6 |
* | | | | | | | | | | | | | Merge branch 'ab/completion-push-delete-ref' | Junio C Hamano | 2017-04-26 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-ref | Ævar Arnfjörð Bjarmason | 2017-04-23 | 1 | -0/+34 |
* | | | | | | | | | | | | | | Merge branch 'jh/add-index-entry-optim' | Junio C Hamano | 2017-04-26 | 7 | -0/+307 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | p0006-read-tree-checkout: perf test to time read-tree | Jeff Hostetler | 2017-04-19 | 4 | -0/+263 |
| * | | | | | | | | | | | | | | read-cache: add strcmp_offset function | Jeff Hostetler | 2017-04-15 | 3 | -0/+44 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 | 2 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | config: correct file reading order in read_early_config()nd/conditional-config-in-early-config | Nguyễn Thái Ngọc Duy | 2017-04-19 | 1 | -0/+18 |