Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | Add missing test file for UTF-16. | Brian M. Carlson | 2013-08-05 | 1 | -0/+0 |
* | | | | | | | | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-08-02 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "cat-file: split --batch input lines on whitespace" | Junio C Hamano | 2013-08-02 | 1 | -7/+0 |
| * | | | | | | | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim | Junio C Hamano | 2013-07-12 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'ob/typofixes' | Junio C Hamano | 2013-08-01 | 6 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 6 | -6/+6 |
* | | | | | | | | | | | | Merge branch 'lf/echo-n-is-not-portable' | Junio C Hamano | 2013-08-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portable | Lukas Fleischer | 2013-07-29 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-08-01 | 1 | -2/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-clean: implement partial matching for selection | Jiang Xin | 2013-07-24 | 1 | -2/+38 |
* | | | | | | | | | | | | | Merge branch 'ml/avoid-using-grep-on-crlf-files' | Junio C Hamano | 2013-07-24 | 3 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-files | Mark Levedahl | 2013-07-18 | 3 | -2/+4 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-07-24 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-log | Junio C Hamano | 2013-07-24 | 1 | -1/+0 |
| * | | | | | | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixes | Eric Sunshine | 2013-07-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | range-set: satisfy non-empty ranges invariant | Eric Sunshine | 2013-07-23 | 1 | -1/+2 |
| * | | | | | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty range | Eric Sunshine | 2013-07-23 | 1 | -0/+5 |
| * | | | | | | | | | | | | | t4211: demonstrate empty -L range crash | Eric Sunshine | 2013-07-23 | 1 | -0/+8 |
* | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |