summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Sync with 1.7.5.3Junio C Hamano2011-05-261-104/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-261-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2011-05-261-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-261-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano2011-05-261-104/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Revert "t0081 (line-buffer): add buffering tests"Jonathan Nieder2011-03-301-104/+2
* | | | | | | | | | | | | | | | | | Merge branch 'jc/bigfile'Junio C Hamano2011-05-251-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Bigfile: teach "git add" to send a large file straight to a packJunio C Hamano2011-05-131-0/+27
* | | | | | | | | | | | | | | | | | | Merge branch 'js/log-abbrev-commit-config'Junio C Hamano2011-05-251-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add log.abbrevCommit config variableJay Soffian2011-05-181-0/+53
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy2011-05-251-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano2011-05-231-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-201-0/+26
* | | | | | | | | | | | | | | | | Merge branch 'ms/ls-remote-exit-with-status'Junio C Hamano2011-05-231-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ls-remote: the --exit-code option reports "no matching refs"Michael Schubert2011-05-181-0/+24
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-scripts-basic'Junio C Hamano2011-05-231-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()Ævar Arnfjörð Bjarmason2011-05-141-0/+51
* | | | | | | | | | | | | | | | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-232-0/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t3703: Skip tests using directory name ":" on WindowsJohannes Sixt2011-05-121-2/+6
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t3703, t4208: add test cases for magic pathspecNguyễn Thái Ngọc Duy2011-05-102-0/+90
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-231-0/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | blame: add --line-porcelain output formatJeff King2011-05-091-0/+19
| * | | | | | | | | | | | | | | | | | | add tests for various blame formatsJeff King2011-05-091-0/+71
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-201-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-201-0/+15
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-161-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-161-17/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-161-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2011-05-191-4/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-141-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | test that git status works with merge conflict in, .gitmodulesHeiko Voigt2011-05-141-4/+88
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-191-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/sparse-co-fix'Junio C Hamano2011-05-191-4/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-101-0/+41
| * | | | | | | | | | | | | | | | | | | | | | | | t1011: fix sparse-checkout initialization and add new fileNguyễn Thái Ngọc Duy2011-05-101-4/+8
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-191-0/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-131-0/+41
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: add option to preserve user namesLuke Diamand2011-04-261-0/+84
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-191-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-191-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-151-3/+287
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-151-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-191-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |