summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/directory-renames-nothanks'Junio C Hamano2018-09-041-1/+109
|\
| * am: avoid directory rename detection when calling recursive merge machineryElijah Newren2018-08-301-2/+2
| * t3401: add another directory rename testcase for rebase and amElijah Newren2018-08-301-1/+109
* | Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano2018-09-041-3/+15
|\ \
| * | sequencer: fix quoting in write_author_scriptPhillip Wood2018-08-071-3/+15
* | | Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano2018-08-271-3/+3
|\ \ \
| * | | t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'SZEDER Gábor2018-08-231-3/+3
* | | | Merge branch 'ab/test-must-be-empty-for-master'Junio C Hamano2018-08-271-1/+1
|\ \ \ \
| * | | | t6018-rev-list-glob: fix 'empty stdin' testSZEDER Gábor2018-08-221-1/+1
* | | | | Merge branch 'sg/t3420-autostash-fix'Junio C Hamano2018-08-271-4/+4
|\ \ \ \ \
| * | | | | t3420-rebase-autostash: don't try to grep non-existing filesSZEDER Gábor2018-08-221-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'sg/t3903-missing-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \
| * | | | | t3903-stash: don't try to grep non-existing fileSZEDER Gábor2018-08-221-1/+1
| |/ / / /
* | | | | Merge branch 'sg/t7501-thinkofix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \
| * | | | | t7501-commit: drop silly command substitutionSZEDER Gábor2018-08-221-1/+1
* | | | | | Merge branch 'sg/t0020-conversion-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | t0020-crlf: check the right fileSZEDER Gábor2018-08-221-1/+1
* | | | | | | Merge branch 'sg/t4051-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t4051-diff-function-context: read the right fileSZEDER Gábor2018-08-221-1/+1
* | | | | | | | Merge branch 'jk/use-compat-util-in-test-tool'Junio C Hamano2018-08-271-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | test-tool.h: include git-compat-util.hJeff King2018-08-211-0/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-2777-344/+231
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-2146-226/+114
| * | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'SZEDER Gábor2018-08-2110-16/+16
| * | | | | | | | tests: use 'test_must_be_empty' instead of 'test ! -s'SZEDER Gábor2018-08-214-4/+4
| * | | | | | | | tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor2018-08-2125-99/+98
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ep/worktree-quiet-option'Junio C Hamano2018-08-271-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | worktree: add --quiet optionElia Pinto2018-08-181-0/+5
* | | | | | | | | Merge branch 'sm/branch-sort-config'Junio C Hamano2018-08-271-0/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: support configuring --sort via .gitconfigSamuel Maftoul2018-08-161-0/+46
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/pack-deltify-regression-fix'Junio C Hamano2018-08-221-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: fix performance issues on packing large deltasNguyễn Thái Ngọc Duy2018-07-231-0/+4
* | | | | | | | | | Merge branch 'ab/checkout-default-remote'Junio C Hamano2018-08-201-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t2024: mark test using "checkout -p" with PERL prerequisiteÆvar Arnfjörð Bjarmason2018-08-181-2/+7
* | | | | | | | | | | Merge branch 'hn/highlight-sideband-keywords'Junio C Hamano2018-08-201-0/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sideband: do not read beyond the end of inputJunio C Hamano2018-08-181-0/+14
| * | | | | | | | | | | sideband: highlight keywords in remote sideband outputHan-Wen Nienhuys2018-08-091-0/+87
* | | | | | | | | | | | Merge branch 'nd/cherry-pick-quit-fix'Junio C Hamano2018-08-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick: fix --quit not deleting CHERRY_PICK_HEADNguyễn Thái Ngọc Duy2018-08-161-1/+6
* | | | | | | | | | | | | Merge branch 'sb/submodule-cleanup'Junio C Hamano2018-08-201-41/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7410: update to new styleStefan Beller2018-08-161-41/+58
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano2018-08-201-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood2018-08-161-1/+14
| * | | | | | | | | | | | | t3430: add conflicting commitPhillip Wood2018-08-161-6/+9
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano2018-08-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: fix numbering in squash messagePhillip Wood2018-08-151-1/+3
* | | | | | | | | | | | | | Merge branch 'sb/config-write-fix'Junio C Hamano2018-08-201-0/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | config: fix case sensitive subsection names on writingStefan Beller2018-08-081-0/+1
| * | | | | | | | | | | | | | t1300: document current behavior of setting optionsStefan Beller2018-08-011-0/+86
* | | | | | | | | | | | | | | Merge branch 'ab/submodule-relative-url-tests'Junio C Hamano2018-08-201-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \