summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add new @ shortcut for HEAD"Junio C Hamano2013-08-141-2/+0
* Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano2013-08-141-18/+0
* Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-08-091-1/+1
|\
| * t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-okPhil Hord2013-08-091-1/+1
* | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-08-051-2/+2
|\ \
| * | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakageRené Scharfe2013-08-051-2/+2
* | | Merge branch 'dn/test-reject-utf-16'Junio C Hamano2013-08-052-2/+2
|\ \ \
| * | | t3900: test rejecting log message with NULs correctlydn/test-reject-utf-16Junio C Hamano2013-08-051-2/+2
| * | | Add missing test file for UTF-16.Brian M. Carlson2013-08-051-0/+0
* | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-08-021-7/+0
|\ \ \ \
| * | | | Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano2013-08-021-7/+0
| * | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optimJunio C Hamano2013-07-121-0/+18
| |\ \ \ \
* | \ \ \ \ Merge branch 'ob/typofixes'Junio C Hamano2013-08-016-6/+6
|\ \ \ \ \ \
| * | | | | | many small typofixesob/typofixesOndřej Bílka2013-07-296-6/+6
* | | | | | | Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano2013-08-011-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portableLukas Fleischer2013-07-291-2/+2
* | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-08-011-2/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | git-clean: implement partial matching for selectionJiang Xin2013-07-241-2/+38
* | | | | | | | | Merge branch 'ml/avoid-using-grep-on-crlf-files'Junio C Hamano2013-07-243-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-filesMark Levedahl2013-07-183-2/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tr/line-log'Junio C Hamano2013-07-241-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-logJunio C Hamano2013-07-241-1/+0
| * | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixesEric Sunshine2013-07-231-1/+1
| * | | | | | | | | range-set: satisfy non-empty ranges invariantEric Sunshine2013-07-231-1/+2
| * | | | | | | | | t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine2013-07-231-0/+5
| * | | | | | | | | t4211: demonstrate empty -L range crashEric Sunshine2013-07-231-0/+8
* | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | t7600: fix typo in test titlemv/merge-ff-tristateJunio C Hamano2013-07-231-1/+1
* | | | | | | | | | Sync with Git 1.8.3.4Junio C Hamano2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update URL to the marc.info mail archiveOndřej Bílka2013-07-221-1/+1
* | | | | | | | | | | Merge branch 'jc/name-rev-exact-ref'Junio C Hamano2013-07-221-0/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | describe: fix --contains when a tag is given as inputjc/name-rev-exact-refJunio C Hamano2013-07-181-0/+12
| * | | | | | | | | | | name-rev: differentiate between tags and commits they point atJunio C Hamano2013-07-181-0/+12
* | | | | | | | | | | | Merge branch 'es/check-mailmap'Junio C Hamano2013-07-221-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t4203: test check-mailmap command invocationes/check-mailmapEric Sunshine2013-07-131-0/+43
* | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-222-18/+493
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | test: run testcases with POSIX absolute paths on WindowsJiang Xin2013-06-261-21/+23
| * | | | | | | | | | | | test: add t7301 for git-clean--interactiveJiang Xin2013-06-261-0/+439
| * | | | | | | | | | | | path.c: refactor relative_path(), not only strip prefixJiang Xin2013-06-261-21/+18
| * | | | | | | | | | | | test: add test cases for relative_pathJiang Xin2013-06-261-0/+37
* | | | | | | | | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-221-0/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-121-0/+70
* | | | | | | | | | | | | | Merge branch 'jk/t0008-sigpipe-fix'Junio C Hamano2013-07-221-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0008: avoid SIGPIPE race condition on fifojk/t0008-sigpipe-fixJeff King2013-07-121-2/+10
* | | | | | | | | | | | | | | Merge branch 'db/show-ref-head'Junio C Hamano2013-07-221-0/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | show-ref: make --head always show the HEAD refdb/show-ref-headDoug Bell2013-07-171-0/+167
* | | | | | | | | | | | | | | | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-07-223-112/+269
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L :funcname testsEric Sunshine2013-07-171-2/+46
| * | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L testsEric Sunshine2013-07-171-3/+101
| * | | | | | | | | | | | | | | t8001/t8002 (blame): modernize styleEric Sunshine2013-07-173-112/+127