summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-232-3/+45
|\
| * archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-221-3/+32
| * mailinfo: read local configurationJunio C Hamano2016-11-221-0/+13
* | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-232-0/+20
|\ \
| * | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-211-1/+1
| * | stripspace: respect repository configJohannes Schindelin2016-11-211-1/+1
| * | rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-212-0/+20
* | | Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2016-11-231-0/+10
|\ \ \ | |_|/ |/| |
| * | for-each-ref: do not segv with %(HEAD) on an unborn branchjc/for-each-ref-head-segfault-fixJunio C Hamano2016-11-181-0/+10
| |/
* | Merge branch 'js/pwd-var-vs-pwd-cmd-fix'Junio C Hamano2016-11-112-3/+3
|\ \
| * | t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesjs/pwd-var-vs-pwd-cmd-fixJohannes Sixt2016-11-112-3/+3
* | | Merge branch 'ls/filter-process'Junio C Hamano2016-11-111-2/+1
|\ \ \
| * | | t0021: remove debugging cruftJunio C Hamano2016-11-111-2/+1
* | | | Merge branch 'as/merge-attr-sleep'Junio C Hamano2016-11-111-5/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleepJohannes Sixt2016-11-111-1/+9
| * | | t6026: ensure that long-running script really isJohannes Schindelin2016-11-101-4/+4
| * | | Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano2016-11-101-1/+1
| * | | Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano2016-11-101-2/+1
| * | | t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab2016-11-101-1/+2
| * | | t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab2016-11-081-1/+1
* | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-11-101-0/+71
|\ \ \ \
| * | | | alternates: re-allow relative paths from environmentjk/alt-odb-cleanupJeff King2016-11-081-0/+71
* | | | | Merge branch 'jk/filter-process-fix'Junio C Hamano2016-11-102-15/+17
|\ \ \ \ \
| * | | | | t0021: fix filehandle usage on older perljk/filter-process-fixJeff King2016-11-021-0/+1
| * | | | | t0021: use $PERL_PATH for rot13-filter.plJeff King2016-11-022-9/+11
| * | | | | t0021: put $TEST_ROOT in $PATHJeff King2016-11-021-3/+4
| * | | | | t0021: use write_script to create rot13 shell scriptJeff King2016-11-021-3/+1
* | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-11-101-5/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | t0021: compute file size with a single process instead of a pipelineJohannes Sixt2016-11-081-1/+1
| * | | | | t0021: expect more variations in the output of uniq -cJohannes Sixt2016-11-081-4/+3
| |/ / / /
* | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-10-312-3/+18
|\ \ \ \ \
| * | | | | valgrind: support test helpersnd/test-helpersRené Scharfe2016-10-272-3/+18
* | | | | | Merge branch 'aw/numbered-stash'Junio C Hamano2016-10-311-0/+35
|\ \ \ \ \ \
| * | | | | | stash: allow stashes to be referenced by index onlyaw/numbered-stashAaron M Watson2016-10-261-0/+35
* | | | | | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-10-311-0/+299
|\ \ \ \ \ \ \
| * | | | | | | trailer: support values folded to multiple linesJonathan Tan2016-10-211-0/+169
| * | | | | | | trailer: forbid leading whitespace in trailersJonathan Tan2016-10-211-0/+15
| * | | | | | | trailer: allow non-trailers in trailer blockJonathan Tan2016-10-211-0/+115
* | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-312-32/+662
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | convert: add filter.<driver>.process optionLars Schneider2016-10-172-3/+633
| * | | | | | | convert: modernize testsLars Schneider2016-10-171-29/+29
* | | | | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-272-4/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: don't be fooled by ita entries when creating initial commitnd/ita-empty-commitNguyễn Thái Ngọc Duy2016-10-241-0/+10
| * | | | | | | | commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-241-0/+11
| * | | | | | | | diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-241-1/+3
| * | | | | | | | diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-242-3/+17
* | | | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: start error messages consistently with lower caseJohannes Schindelin2016-10-211-1/+1
* | | | | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-271-13/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0060: sidestep surprising path mangling results on Windowssb/submodule-ignore-trailing-slashJohannes Sixt2016-10-251-13/+14