summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/difftool' into maintJunio C Hamano2016-06-061-0/+23
|\
| * difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-161-0/+23
* | Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-061-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 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-061-0/+42
|\ \ \
| * | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-131-0/+42
* | | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-311-1/+23
|\ \ \ \
| * | | | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-051-1/+23
| | |/ / | |/| |
* | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
|\ \ \ \
| * | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
| | |/ / | |/| |
* | | | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-311-1/+1
|\ \ \ \
| * | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-221-1/+1
| |/ / /
* | | | Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-261-0/+18
|\ \ \ \
| * | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commitJunio C Hamano2016-05-101-0/+18
* | | | | Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-262-0/+50
|\ \ \ \ \
| * | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-112-0/+50
| | |_|/ / | |/| | |
* | | | | Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \
| * | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-061-1/+1
| |/ / / /
* | | | | Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
|\ \ \ \ \
| * | | | | t6041: do not compress backup tar filesb/z-is-gnutar-ismStefan Beller2016-05-091-2/+2
| * | | | | t3513: do not compress backup tar fileStefan Beller2016-05-091-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-261-9/+9
|\ \ \ \ \
| * | | | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updatesVasco Almeida2016-05-121-9/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \
| * | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-emptyArmin Kunaschik2016-05-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-261-15/+13
|\ \ \ \ \
| * | | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seqJunio C Hamano2016-05-091-1/+6
| * | | | | test-lib-functions.sh: remove misleading comment on test_seqJunio C Hamano2016-05-091-14/+7
| |/ / / /
* | | | | Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \
| * | | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fixTorsten Bögershausen2016-05-091-1/+1
| |/ / / /
* | | | | Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \
| * | | | | t7300: mark test with SANITYsb/clean-test-fixStefan Beller2016-05-031-1/+1
* | | | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-181-5/+5
|\ \ \ \ \ \
| * | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-awaySZEDER Gábor2016-04-221-5/+5
* | | | | | | Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-181-0/+1
|\ \ \ \ \ \ \
| * | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | | | | | Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-181-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-281-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-181-6/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5504: drop sigpipe=ok from push testsJeff King2016-04-201-6/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-181-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-191-0/+16
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-182-6/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
View Lorry Controller Status