summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano2013-09-092-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 'jk/cat-file-batch-optim'Junio C Hamano2013-09-091-0/+15
|\ \
| * | cat-file: only split on whitespace when %(rest) is usedjk/cat-file-batch-optimJeff King2013-08-051-0/+15
* | | Merge branch 'es/blame-L-more'Junio C Hamano2013-09-092-14/+159
|\ \ \
| * | | blame: reject empty ranges -L,+0 and -L,-0es/blame-L-moreEric Sunshine2013-08-051-2/+2
| * | | t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0Eric Sunshine2013-08-051-0/+8
| * | | blame: reject empty ranges -LX,+0 and -LX,-0Eric Sunshine2013-08-051-2/+2
| * | | t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0Eric Sunshine2013-08-051-0/+8
| * | | log: fix -L bounds checking bugEric Sunshine2013-08-051-1/+1
| * | | t4211: retire soon-to-be unimplementable testsEric Sunshine2013-08-051-13/+0
| * | | t4211: log: demonstrate -L bounds checking bugEric Sunshine2013-08-051-0/+30
| * | | blame: fix -L bounds checking bugEric Sunshine2013-08-051-4/+4
| * | | t8001/t8002: blame: add empty file & partial-line testsEric Sunshine2013-08-051-0/+72
| * | | t8001/t8002: blame: demonstrate -L bounds checking bugEric Sunshine2013-08-051-0/+22
| * | | t8001/t8002: blame: decompose overly-large testEric Sunshine2013-08-051-7/+25
* | | | Merge branch 'db/http-savecookies'Junio C Hamano2013-09-092-0/+24
|\ \ \ \
| * | | | t5551: Remove header from curl cookie filedb/http-savecookiesBrian Gernhardt2013-08-051-4/+2
| * | | | http: add http.savecookies option to write out HTTP cookiesDave Borowitz2013-07-302-0/+26
* | | | | Merge branch 'jc/push-cas'Junio C Hamano2013-09-093-2/+208
|\ \ \ \ \
| * | | | | push: teach --force-with-lease to smart-http transportJunio C Hamano2013-08-022-2/+3
| * | | | | t5540/5541: smart-http does not support "--force-with-lease"Junio C Hamano2013-08-011-0/+16
| * | | | | t5533: test "push --force-with-lease"Junio C Hamano2013-07-221-0/+189
* | | | | | Merge branch 'ms/fetch-prune-configuration'Junio C Hamano2013-09-091-0/+82
|\ \ \ \ \ \
| * | | | | | fetch: make --prune configurablems/fetch-prune-configurationMichael Schubert2013-07-181-0/+82
* | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean'Junio C Hamano2013-09-041-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 'sg/bash-prompt-lf-in-cwd-test'Junio C Hamano2013-09-041-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | bash prompt: test the prompt with newline in repository pathsg/bash-prompt-lf-in-cwd-testSZEDER Gábor2013-08-181-0/+23
* | | | | | | | | Merge branch 'mm/no-shell-escape-in-die-message'Junio C Hamano2013-09-041-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 'tr/fd-gotcha-fixes'Junio C Hamano2013-09-041-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0070: test that git_mkstemps correctly checks return value of open()tr/fd-gotcha-fixesDale R. Worley2013-08-061-0/+4
* | | | | | | | | | Merge branch 'jk/fast-import-empty-ls'Junio C Hamano2013-09-041-0/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: allow moving the root treejk/fast-import-empty-lsJohn Keeping2013-06-231-1/+1
| * | | | | | | | | | fast-import: allow ls or filecopy of the root treeJohn Keeping2013-06-231-2/+2
| * | | | | | | | | | t9300: document fast-import empty path issuesJohn Keeping2013-06-231-0/+65
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix'Junio C Hamano2013-08-301-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