summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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 '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 '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-051-0/+17
|\ \ \ \ \
| * | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-181-0/+17
* | | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-051-0/+8
|\ \ \ \ \ \
| * | | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-0/+8
* | | | | | | Merge branch 'jt/use-trailer-api-in-commands' into maintJunio C Hamano2017-06-041-0/+44
|\ \ \ \ \ \ \
| * | | | | | | sequencer: add newline before adding footersjt/use-trailer-api-in-commandsJonathan Tan2017-04-261-0/+44
* | | | | | | | Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-0/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-0/+37
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'js/eol-on-ourselves' into maintJunio C Hamano2017-06-047-25/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselvesJohannes Schindelin2017-05-101-0/+1
| * | | | | | | | Fix the remaining tests that failed with core.autocrlf=trueJohannes Schindelin2017-05-101-1/+20
| * | | | | | | | t3901: move supporting files into t/t3901/Johannes Schindelin2017-05-106-24/+24
* | | | | | | | | Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maintJunio C Hamano2017-06-041-1/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision.c: ignore broken tags with ignore_missing_linksjk/ignore-broken-tags-when-ignoring-missing-linksJeff King2017-05-201-1/+26
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2017-06-041-3/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5310: fix "; do" stylejk/disable-pack-reuse-when-brokenJeff King2017-05-091-4/+8
| * | | | | | | | | pack-objects: disable pack reuse for object-selection optionsJeff King2017-05-091-0/+38
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bw/submodule-with-bs-path' into maintJunio C Hamano2017-06-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7400: add !CYGWIN prerequisite to 'add with \\ in path'bw/submodule-with-bs-pathRamsay Jones2017-05-011-1/+1
* | | | | | | | | | Merge branch 'ah/log-decorate-default-to-auto' into maintJunio C Hamano2017-06-041-0/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/log: honor log.decorateah/log-decorate-default-to-autobrian m. carlson2017-05-151-0/+12
* | | | | | | | | | | Merge branch 'ab/fix-poison-tests' into maintJunio C Hamano2017-06-0415-34/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason2017-05-1115-34/+38
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/doc-replace-gmane-links' into maintJunio C Hamano2017-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | doc: replace more gmane linksab/doc-replace-gmane-linksJunio C Hamano2017-05-091-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-05-091-8/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | t1450: avoid use of "sed" on the index, which is a binary filejh/verify-index-checksum-only-in-fsckJeff Hostetler2017-04-271-8/+26
* | | | | | | | | | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-011-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-execStephen Hicks2017-04-271-0/+14
* | | | | | | | | | | Merge branch 'jk/submodule-init-segv-fix'Junio C Hamano2017-05-011-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fixJeff King2017-04-241-0/+8
* | | | | | | | | | | | Merge branch 'ab/align-perf-descriptions'Junio C Hamano2017-05-012-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | t/perf: correctly align non-ASCII descriptions in outputab/align-perf-descriptionsÆvar Arnfjörð Bjarmason2017-04-232-0/+5
* | | | | | | | | | | | Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-261-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree add: add --lock optionnd/worktree-add-lockNguyễn Thái Ngọc Duy2017-04-201-0/+6
* | | | | | | | | | | | | Merge branch 'ab/completion-push-delete-ref'Junio C Hamano2017-04-261-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-refÆvar Arnfjörð Bjarmason2017-04-231-0/+34
* | | | | | | | | | | | | | Merge branch 'jh/add-index-entry-optim'Junio C Hamano2017-04-267-0/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | p0006-read-tree-checkout: perf test to time read-treeJeff Hostetler2017-04-194-0/+263
| * | | | | | | | | | | | | | read-cache: add strcmp_offset functionJeff Hostetler2017-04-153-0/+44
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-262-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | config: correct file reading order in read_early_config()nd/conditional-config-in-early-configNguyễn Thái Ngọc Duy2017-04-191-0/+18