summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-221-9/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: allow --patch & cie to override -s/--no-patchMatthieu Moy2013-07-171-0/+18
| * | | | | | | | | | | | diff: allow --no-patch as synonym for -sMatthieu Moy2013-07-171-0/+12
| * | | | | | | | | | | | t4000-diff-format.sh: modernize styleMatthieu Moy2013-07-171-9/+9
* | | | | | | | | | | | | Merge branch 'jc/mailmap-case-insensitivity'Junio C Hamano2013-07-221-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mailmap: do not downcase mailmap entriesJunio C Hamano2013-07-151-1/+1
| * | | | | | | | | | | | | t4203: demonstrate loss of uppercase characters in canonical emailEric Sunshine2013-07-151-0/+9
| * | | | | | | | | | | | | mailmap: do not lose single-letter namesJunio C Hamano2013-07-151-1/+1
| * | | | | | | | | | | | | t4203: demonstrate loss of single-character name in mailmap entryEric Sunshine2013-07-151-0/+9
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/simple-add-must-be-a-no-op'Junio C Hamano2013-07-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t2202: make sure "git add" (no args) stays a no-opjc/simple-add-must-be-a-no-opJunio C Hamano2013-07-191-0/+10
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-07-211-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname' into maintJunio C Hamano2013-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-diff-core-safecrlf' into maintJunio C Hamano2013-07-211-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t9801: git-p4: check ignore files with client specVitor Antunes2013-07-211-3/+20
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2013-07-192-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t1512-fix' into maintJunio C Hamano2013-07-191-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vl/typofix' into maintJunio C Hamano2013-07-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \