summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* submodule update: learn `--[no-]recommend-shallow` optionStefan Beller2016-05-271-0/+52
* Merge branch 'da/difftool'Junio C Hamano2016-05-231-0/+23
|\
| * difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-161-0/+23
| * Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-062-5/+126
| |\
| * \ Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-023-18/+20
| |\ \
| * \ \ Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-0/+20
| |\ \ \
| * \ \ \ Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-0/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-0/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-1/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-0/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-0/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-291-0/+11
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-z-n-unquoted'Junio C Hamano2016-05-2313-111/+121
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquotedJeff King2016-05-141-1/+1
| * | | | | | | | | | | | t9103: modernize test styleJeff King2016-05-141-10/+12
| * | | | | | | | | | | | t9107: switch inverted single/double quotes in testJeff King2016-05-141-2/+3
| * | | | | | | | | | | | t9107: use "return 1" instead of "exit 1"Jeff King2016-05-141-16/+26
| * | | | | | | | | | | | t9100,t3419: enclose all test code in single-quotesJeff King2016-05-132-20/+20
| * | | | | | | | | | | | t/lib-git-svn: drop $remote_git_svn and $git_svn_idJeff King2016-05-1311-63/+60
* | | | | | | | | | | | | Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano2016-05-231-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-131-0/+42
* | | | | | | | | | | | | | Merge branch 'js/perf-rebase-i'Junio C Hamano2016-05-232-8/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | perf: run "rebase -i" under perfJohannes Schindelin2016-05-131-0/+36
| * | | | | | | | | | | | | | perf: make the tests work in worktreesJohannes Schindelin2016-05-131-7/+7
| * | | | | | | | | | | | | | perf: let's disable symlinks when they are not availableJohannes Schindelin2016-05-131-1/+4
* | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect'Junio C Hamano2016-05-232-60/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expectJunio C Hamano2016-05-101-18/+2
| * | | | | | | | | | | | | | | t0040: remove unused test helpersJunio C Hamano2016-05-101-24/+0
| * | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify testsJunio C Hamano2016-05-101-0/+1
| * | | | | | | | | | | | | | | test-parse-options: fix output when callback option failsJunio C Hamano2016-05-101-3/+1
* | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-233-71/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-101-0/+51
| * | | | | | | | | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva2016-05-051-7/+9
| * | | | | | | | | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-051-14/+14
| * | | | | | | | | | | | | | | t/t7507: improve test coveragePranit Bauva2016-05-051-0/+5
| * | | | | | | | | | | | | | | t0040-parse-options: improve test coveragePranit Bauva2016-05-051-0/+114
| * | | | | | | | | | | | | | | test-parse-options: print quiet as integerPranit Bauva2016-04-191-13/+13
| * | | | | | | | | | | | | | | t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-191-38/+38
* | | | | | | | | | | | | | | | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-231-0/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-261-0/+19
| * | | | | | | | | | | | | | | | format-patch: introduce --base=auto optionXiaolong Ye2016-04-261-0/+39
| * | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-261-0/+47
* | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-231-170/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-251-1/+1
| * | | | | | | | | | | | | | | | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-0/+8
| * | | | | | | | | | | | | | | | | worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+13