| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'tr/log-full-diff-keep-true-parents' | Junio C Hamano | 2013-09-09 | 2 | -0/+28 |
|\ |
|
| * | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parents | Thomas Rast | 2013-08-05 | 1 | -0/+22 |
| * | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 | 1 | -0/+6 |
* | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-09-09 | 1 | -0/+15 |
|\ \ |
|
| * | | cat-file: only split on whitespace when %(rest) is usedjk/cat-file-batch-optim | Jeff King | 2013-08-05 | 1 | -0/+15 |
* | | | Merge branch 'es/blame-L-more' | Junio C Hamano | 2013-09-09 | 2 | -14/+159 |
|\ \ \ |
|
| * | | | blame: reject empty ranges -L,+0 and -L,-0es/blame-L-more | Eric Sunshine | 2013-08-05 | 1 | -2/+2 |
| * | | | t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0 | Eric Sunshine | 2013-08-05 | 1 | -0/+8 |
| * | | | blame: reject empty ranges -LX,+0 and -LX,-0 | Eric Sunshine | 2013-08-05 | 1 | -2/+2 |
| * | | | t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0 | Eric Sunshine | 2013-08-05 | 1 | -0/+8 |
| * | | | log: fix -L bounds checking bug | Eric Sunshine | 2013-08-05 | 1 | -1/+1 |
| * | | | t4211: retire soon-to-be unimplementable tests | Eric Sunshine | 2013-08-05 | 1 | -13/+0 |
| * | | | t4211: log: demonstrate -L bounds checking bug | Eric Sunshine | 2013-08-05 | 1 | -0/+30 |
| * | | | blame: fix -L bounds checking bug | Eric Sunshine | 2013-08-05 | 1 | -4/+4 |
| * | | | t8001/t8002: blame: add empty file & partial-line tests | Eric Sunshine | 2013-08-05 | 1 | -0/+72 |
| * | | | t8001/t8002: blame: demonstrate -L bounds checking bug | Eric Sunshine | 2013-08-05 | 1 | -0/+22 |
| * | | | t8001/t8002: blame: decompose overly-large test | Eric Sunshine | 2013-08-05 | 1 | -7/+25 |
* | | | | Merge branch 'db/http-savecookies' | Junio C Hamano | 2013-09-09 | 2 | -0/+24 |
|\ \ \ \ |
|
| * | | | | t5551: Remove header from curl cookie filedb/http-savecookies | Brian Gernhardt | 2013-08-05 | 1 | -4/+2 |
| * | | | | http: add http.savecookies option to write out HTTP cookies | Dave Borowitz | 2013-07-30 | 2 | -0/+26 |
* | | | | | Merge branch 'jc/push-cas' | Junio C Hamano | 2013-09-09 | 3 | -2/+208 |
|\ \ \ \ \ |
|
| * | | | | | push: teach --force-with-lease to smart-http transport | Junio C Hamano | 2013-08-02 | 2 | -2/+3 |
| * | | | | | t5540/5541: smart-http does not support "--force-with-lease" | Junio C Hamano | 2013-08-01 | 1 | -0/+16 |
| * | | | | | t5533: test "push --force-with-lease" | Junio C Hamano | 2013-07-22 | 1 | -0/+189 |
* | | | | | | Merge branch 'ms/fetch-prune-configuration' | Junio C Hamano | 2013-09-09 | 1 | -0/+82 |
|\ \ \ \ \ \ |
|
| * | | | | | | fetch: make --prune configurablems/fetch-prune-configuration | Michael Schubert | 2013-07-18 | 1 | -0/+82 |
* | | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean' | Junio C Hamano | 2013-09-04 | 1 | -0/+10 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-boolean | Jharrod LaFon | 2013-08-19 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'sg/bash-prompt-lf-in-cwd-test' | Junio C Hamano | 2013-09-04 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | bash prompt: test the prompt with newline in repository pathsg/bash-prompt-lf-in-cwd-test | SZEDER Gábor | 2013-08-18 | 1 | -0/+23 |
* | | | | | | | | | Merge branch 'mm/no-shell-escape-in-die-message' | Junio C Hamano | 2013-09-04 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-message | Matthieu Moy | 2013-08-07 | 1 | -0/+13 |
| | |_|_|_|_|/ / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge branch 'tr/fd-gotcha-fixes' | Junio C Hamano | 2013-09-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | t0070: test that git_mkstemps correctly checks return value of open()tr/fd-gotcha-fixes | Dale R. Worley | 2013-08-06 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'jk/fast-import-empty-ls' | Junio C Hamano | 2013-09-04 | 1 | -0/+65 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | fast-import: allow moving the root treejk/fast-import-empty-ls | John Keeping | 2013-06-23 | 1 | -1/+1 |
| * | | | | | | | | | | fast-import: allow ls or filecopy of the root tree | John Keeping | 2013-06-23 | 1 | -2/+2 |
| * | | | | | | | | | | t9300: document fast-import empty path issues | John Keeping | 2013-06-23 | 1 | -0/+65 |
| | |_|_|_|/ / / / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge branch 'bc/completion-for-bash-3.0' | Junio C Hamano | 2013-08-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | t9902-completion.sh: old Bash still does not support array+=('') notation | Brandon Casey | 2013-08-21 | 1 | -1/+1 |
| | |_|_|/ / / / / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix' | Junio C Hamano | 2013-08-30 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fix | Nguyễn Thái Ngọc Duy | 2013-08-25 | 1 | -0/+16 |
* | | | | | | | | | | Revert "Add new @ shortcut for HEAD" | Junio C Hamano | 2013-08-14 | 1 | -2/+0 |
* | | | | | | | | | | Revert "git stash: avoid data loss when "git stash save" kills a directory" | Junio C Hamano | 2013-08-14 | 1 | -18/+0 |
* | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-08-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-ok | Phil Hord | 2013-08-09 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakage | René Scharfe | 2013-08-05 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'dn/test-reject-utf-16' | Junio C Hamano | 2013-08-05 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | t3900: test rejecting log message with NULs correctlydn/test-reject-utf-16 | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |