summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-5/+7
|\
| * completion: use __gitcomp_builtin in _git_checkoutNguyễn Thái Ngọc Duy2018-02-091-5/+7
* | Merge branch 'jk/add-i-diff-filter'Junio C Hamano2018-03-141-0/+20
|\ \
| * | add--interactive: detect bogus diffFilter outputjk/add-i-diff-filterJeff King2018-03-051-0/+8
| * | t3701: add a test for interactive.diffFilterJeff King2018-03-051-0/+12
* | | Merge branch 'nd/worktree-move'Junio C Hamano2018-03-141-1/+84
|\ \ \
| * | | t2028: fix minor error and issues in newly-added "worktree move" testsnd/worktree-moveEric Sunshine2018-03-061-10/+9
| * | | worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy2018-02-121-0/+17
| * | | worktree remove: new commandNguyễn Thái Ngọc Duy2018-02-121-0/+30
| * | | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2018-02-121-0/+11
| * | | worktree move: new commandNguyễn Thái Ngọc Duy2018-02-121-0/+26
* | | | Merge branch 'pw/add-p-recount'Junio C Hamano2018-03-141-130/+165
|\ \ \ \
| * | | | add -p: fix counting when splitting and coalescingPhillip Wood2018-03-051-8/+23
| * | | | add -p: calculate offset delta for edited patchesPhillip Wood2018-03-051-1/+1
| * | | | add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood2018-03-011-1/+1
| * | | | t3701: add failing test for pathological context linesPhillip Wood2018-03-011-0/+30
| * | | | t3701: don't hard code sha1 hash valuesPhillip Wood2018-03-011-10/+23
| * | | | t3701: use test_write_lines and write_scriptPhillip Wood2018-02-201-28/+5
| * | | | t3701: indent here documentsPhillip Wood2018-02-201-87/+87
| |/ / /
* | | | Merge branch 'sg/test-x'Junio C Hamano2018-03-1411-61/+93
|\ \ \ \
| * | | | t/README: add a note about don't saving stderr of compound commandsSZEDER Gábor2018-02-281-3/+17
| * | | | t1510-repo-setup: mark as untraceable with '-x'SZEDER Gábor2018-02-281-0/+4
| * | | | t9903-bash-prompt: don't check the stderr of __git_ps1()SZEDER Gábor2018-02-281-12/+2
| * | | | t5570-git-daemon: don't check the stderr of a subshellSZEDER Gábor2018-02-281-1/+1
| * | | | t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log fileSZEDER Gábor2018-02-281-1/+1
| * | | | t5500-fetch-pack: don't check the stderr of a subshellSZEDER Gábor2018-02-281-6/+6
| * | | | t3030-merge-recursive: don't check the stderr of a subshellSZEDER Gábor2018-02-281-16/+20
| * | | | t1507-rev-parse-upstream: don't check the stderr of a shell functionSZEDER Gábor2018-02-271-7/+7
| * | | | t: add means to disable '-x' tracing for individual test scriptsSZEDER Gábor2018-02-272-1/+21
| * | | | t: prevent '-x' tracing from interfering with test helpers' stderrSZEDER Gábor2018-02-272-14/+14
* | | | | Merge branch 'rj/test-i18ngrep'Junio C Hamano2018-03-142-21/+6
|\ \ \ \ \
| * | | | | t5536: simplify checking of messages output to stderrrj/test-i18ngrepSZEDER Gábor2018-02-281-18/+4
| * | | | | t4151: consolidate multiple calls to test_i18ngrepRamsay Jones2018-02-121-3/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-145-0/+37
|\ \ \ \ \
| * | | | | diff: add --compact-summarynd/diff-stat-with-summaryNguyễn Thái Ngọc Duy2018-02-275-0/+37
* | | | | | Merge branch 'ag/userdiff-go-funcname'Junio C Hamano2018-03-086-0/+26
|\ \ \ \ \ \
| * | | | | | userdiff: add built-in pattern for golangag/userdiff-go-funcnameAlban Gruin2018-03-016-0/+26
* | | | | | | Merge branch 'bp/untracked-cache-noflush'Junio C Hamano2018-03-081-0/+3
|\ \ \ \ \ \ \
| * | | | | | | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflushJunio C Hamano2018-02-281-2/+2
| * | | | | | | dir.c: don't flag the index as dirty for changes to the untracked cacheBen Peart2018-02-051-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs/perf-repeat-thrice-by-default'Junio C Hamano2018-03-081-5/+3
|\ \ \ \ \ \ \
| * | | | | | | perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config filers/perf-repeat-thrice-by-defaultRené Scharfe2018-02-271-5/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/test-must-be-empty'Junio C Hamano2018-03-081-1/+5
|\ \ \ \ \ \ \
| * | | | | | | test_must_be_empty: make sure the file exists, not just emptyJunio C Hamano2018-02-271-1/+5
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-271-2/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-271-1/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-0/+72
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-082-0/+104
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-241-0/+29
| * | | | | | | | | | status: update short status to respect --no-ahead-behindJeff Hostetler2018-01-241-0/+13