summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sd/stash-wo-user-name'Junio C Hamano2019-01-041-0/+28
|\
| * stash: tolerate missing user identitySlavica Djukic2018-11-191-0/+28
* | Merge branch 'sg/clone-initial-fetch-configuration'Junio C Hamano2019-01-041-0/+47
|\ \
| * | clone: respect additional configured fetch refspecs during initial fetchSZEDER Gábor2018-11-161-0/+47
* | | Merge branch 'nd/checkout-dwim-fix'Junio C Hamano2019-01-042-1/+33
|\ \ \
| * | | checkout: disambiguate dwim tracking branches and local filesNguyễn Thái Ngọc Duy2018-11-142-1/+33
| | |/ | |/|
* | | Merge branch 'ab/push-dwim-dst'Junio C Hamano2019-01-041-0/+55
|\ \ \
| * | | push: test that <src> doesn't DWYM if <dst> is unqualifiedÆvar Arnfjörð Bjarmason2018-11-141-0/+27
| * | | push: add an advice on unqualified <dst> pushÆvar Arnfjörð Bjarmason2018-11-141-0/+28
| |/ /
* | | Merge branch 'en/fast-export-import'Junio C Hamano2019-01-041-3/+77
|\ \ \
| * | | fast-export: add a --show-original-ids option to show original namesElijah Newren2018-11-171-0/+17
| * | | fast-export: add --reference-excluded-parents optionElijah Newren2018-11-171-0/+11
| * | | fast-export: ensure we export requested refsElijah Newren2018-11-171-3/+13
| * | | fast-export: when using paths, avoid corrupt stream with non-existent markElijah Newren2018-11-171-0/+20
| * | | fast-export: avoid dying when filtering by paths and old tags existElijah Newren2018-11-171-0/+16
| |/ /
* | | Merge branch 'en/merge-path-collision'Junio C Hamano2019-01-043-78/+829
|\ \ \
| * | | t6036: avoid non-portable "cp -a"Carlo Marcelo Arenas Belón2018-12-011-1/+1
| * | | t6036, t6043: increase code coverage for file collision handlingElijah Newren2018-11-082-0/+88
| * | | merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren2018-11-082-17/+36
| * | | merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren2018-11-083-58/+75
| * | | merge-recursive: fix rename/add conflict handlingElijah Newren2018-11-082-13/+15
| * | | merge-recursive: increase marker length with depth of recursionElijah Newren2018-11-081-0/+151
| * | | t6036, t6042: testcases for rename collision of already conflicting filesElijah Newren2018-11-082-0/+312
| * | | t6042: add tests for consistency in file collision conflict handlingElijah Newren2018-11-081-0/+162
* | | | Merge branch 'nd/i18n'Junio C Hamano2019-01-048-44/+44
|\ \ \ \
| * | | | fsck: mark strings for translationNguyễn Thái Ngọc Duy2018-11-124-33/+33
| * | | | parse-options.c: mark more strings for translationNguyễn Thái Ngọc Duy2018-11-121-2/+2
| * | | | parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy2018-11-121-1/+1
| * | | | read-cache.c: mark more strings for translationNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | | | | Merge branch 'jc/run-command-report-exec-failure-fix' into maintJunio C Hamano2018-12-151-3/+6
|\ \ \ \ \
| * | | | | run-command: report exec failureJunio C Hamano2018-12-121-3/+6
* | | | | | Merge branch 'js/t9902-send-email-completion-fix' into maintJunio C Hamano2018-12-151-1/+1
|\ \ \ \ \ \
| * | | | | | t9902: 'send-email' test case requires PERLJohannes Schindelin2018-12-141-1/+1
* | | | | | | Merge branch 'js/mailinfo-format-flowed-fix' into maintJunio C Hamano2018-12-151-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | t4256: mark support files as LF-onlyJohannes Schindelin2018-12-131-0/+1
* | | | | | | Merge branch 'es/format-patch-range-diff-fix-fix'Junio C Hamano2018-12-041-7/+13
|\ \ \ \ \ \ \
| * | | | | | | range-diff: always pass at least minimal diff optionsMartin Ågren2018-12-041-7/+13
* | | | | | | | Merge branch 'sg/test-BUG'Junio C Hamano2018-12-017-23/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: send "bug in the test script" errors to the script's stderrSZEDER Gábor2018-11-207-23/+26
* | | | | | | | | Merge branch 'sg/test-cmp-rev'Junio C Hamano2018-12-011-3/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib-functions: make 'test_cmp_rev' more informative on failureSZEDER Gábor2018-11-201-3/+17
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sg/daemon-test-signal-fix'Junio C Hamano2018-12-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/lib-git-daemon: fix signal checkingSZEDER Gábor2018-11-271-1/+1
* | | | | | | | | | Merge branch 'ab/replace-graft-with-replace-advice'Junio C Hamano2018-12-011-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | advice: don't pointlessly suggest --convert-graft-fileÆvar Arnfjörð Bjarmason2018-11-291-1/+4
| * | | | | | | | | | Merge branch 'sg/test-rebase-editor-fix' into maintJunio C Hamano2018-11-212-7/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/t7005-bash-workaround' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/t1400-undebug-test' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/t5551-with-curl-7.61.1' into maintJunio C Hamano2018-11-211-34/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/split-index-test' into maintJunio C Hamano2018-11-212-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \