summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2011-05-19Merge branch 'ld/p4-preserve-user-names'Libravatar Junio C Hamano1-0/+125
2011-05-19Merge branch 'jk/git-connection-deadlock-fix'Libravatar Junio C Hamano1-0/+43
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Libravatar Junio C Hamano1-2/+25
2011-05-19Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano1-0/+17
2011-05-19Revert "Merge branch 'en/merge-recursive'"Libravatar Junio C Hamano1-63/+0
2011-05-18test core.gitproxy configurationLibravatar Jeff King1-0/+43
2011-05-16Merge branch 'ci/commit--interactive-atomic'Libravatar Junio C Hamano1-4/+17
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano1-6/+58
2011-05-16t3503: test cherry picking and reverting root commitsLibravatar Jeff King1-2/+25
2011-05-15Merge branch 'jm/mergetool-submodules' into maintLibravatar Junio C Hamano1-3/+287
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintLibravatar Junio C Hamano1-0/+42
2011-05-13git-p4: warn if git authorship won't be retainedLibravatar Luke Diamand1-0/+41
2011-05-13Merge branch 'bf/commit-template-no-cleanup'Libravatar Junio C Hamano2-0/+22
2011-05-13Merge branch 'jc/t1506-shell-param-expansion-gotcha'Libravatar Junio C Hamano1-2/+5
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano1-0/+979
2011-05-13Merge branch 'jc/fix-add-u-unmerged'Libravatar Junio C Hamano1-17/+7
2011-05-13Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Libravatar Junio C Hamano1-0/+50
2011-05-13Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintLibravatar Junio C Hamano1-1/+31
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano2-2/+13
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano1-0/+100
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano13-22/+102
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano1-0/+62
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
2011-05-12Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-7/+7
2011-05-12Tweak t3102-ls-tree-wildcards to run on WindowsLibravatar Johannes Sixt1-7/+7
2011-05-11Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano1-0/+17
2011-05-11Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano1-0/+17
2011-05-11setup_revisions(): take pathspec from command line and --stdin correctlyLibravatar Junio C Hamano1-0/+17
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano1-0/+32
2011-05-11Merge branch 'jn/maint-test-merge-verify-parents'Libravatar Junio C Hamano2-99/+98
2011-05-11Merge branch 'jc/maint-add-p-overlapping-hunks'Libravatar Junio C Hamano1-0/+36
2011-05-11Merge branch 'dm/http-cleanup'Libravatar Junio C Hamano1-2/+16
2011-05-11Merge branch 'jn/ctags'Libravatar Junio C Hamano2-0/+123
2011-05-11Do not strip empty lines / trailing spaces from a commit message templateLibravatar Boris Faure2-0/+22
2011-05-10Test atomic git-commit --interactiveLibravatar Conrad Irwin1-0/+10
2011-05-09Allow git commit --interactive with pathsLibravatar Conrad Irwin1-2/+3
2011-05-09t7501.8: feed a meaningful commandLibravatar Jeff King1-4/+6
2011-05-09t1507: avoid "${parameter<op>'word'}" inside double-quotesLibravatar Junio C Hamano1-2/+5
2011-05-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
2011-05-06tests: check git does not barf on merge.ff values for future versions of gitLibravatar Jonathan Nieder1-2/+14
2011-05-06tests: teach verify_parents to check for extra parentsLibravatar Jonathan Nieder1-0/+1
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-2/+41
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configLibravatar Junio C Hamano1-0/+33
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano1-0/+32
2011-05-06tests: eliminate unnecessary setup test assertionsLibravatar Jonathan Nieder2-99/+97
2011-05-06Merge branch 'jn/run-command-error-failure'Libravatar Junio C Hamano1-0/+23
2011-05-06Merge branch 'jk/merge-one-file-working-tree'Libravatar Junio C Hamano1-0/+100
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Libravatar Junio C Hamano13-22/+102
2011-05-06Merge branch 'js/blame-parsename'Libravatar Junio C Hamano2-2/+13