summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano2013-09-181-1/+1
|\
| * t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
* | Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2013-09-181-0/+13
|\ \
| * | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-071-0/+13
* | | Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2013-09-181-0/+10
|\ \ \
| * | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-191-0/+10
* | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-182-0/+28
|\ \ \ \
| * | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-051-0/+22
| * | | | log: use true parents for diff even when rewritingThomas Rast2013-08-011-0/+6
* | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-181-0/+72
|\ \ \ \ \
| * | | | | t5802: add test for connect helperJunio C Hamano2013-08-071-0/+72
| | |_|/ / | |/| | |
* | | | | Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-181-0/+14
|\ \ \ \ \
| * | | | | xread, xwrite: limit size of IO to 8MBSteffen Prohaska2013-08-201-0/+14
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-181-1/+15
|\ \ \ \ \
| * | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-lineJeff King2013-08-281-1/+15
* | | | | | t7406-submodule-update: add missing &&Tay Ray Chuan2013-09-171-1/+1
* | | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-051-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fixNguyễn Thái Ngọc Duy2013-08-251-0/+16
| |/ / / /
* | | | | 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
View Lorry Controller Status