summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
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-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
2011-05-06tests: teach verify_parents to check for extra parentsLibravatar Jonathan Nieder1-0/+1
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
2011-05-06Merge branch 'jk/format-patch-quote-special-in-from'Libravatar Junio C Hamano1-0/+43
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-0/+22
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Libravatar Junio C Hamano1-1/+31
2011-05-06Merge branch 'mg/alias-expose-prefix'Libravatar Junio C Hamano1-0/+21
2011-05-05Merge branch 'maint'Libravatar Junio C Hamano1-3/+2
2011-05-05t3701: fix here documentLibravatar Junio C Hamano1-3/+2
2011-05-05t/annotate-tests: Use echo & cat instead of sedLibravatar Brian Gernhardt1-1/+2
2011-05-04Merge branch 'ml/test-readme'Libravatar Junio C Hamano1-8/+9
2011-05-04Merge branch 'mg/rev-list-count-cherry'Libravatar Junio C Hamano1-0/+27
2011-05-04Merge branch 'jk/format-patch-multiline-header'Libravatar Junio C Hamano1-0/+15
2011-05-04Merge branch 'jm/mergetool-submodules'Libravatar Junio C Hamano1-3/+287
2011-05-04Merge branch 'jh/dirstat' into maintLibravatar Junio C Hamano6-7/+40
2011-05-04Merge branch 'jk/maint-stash-oob' into maintLibravatar Junio C Hamano1-5/+11
2011-05-04Merge branch 'dm/stash-k-i-p' into maintLibravatar Junio C Hamano2-0/+20
2011-05-04Merge branch 'mg/reflog-with-options' into maintLibravatar Junio C Hamano1-0/+18
2011-05-04Merge branch 'jk/stash-loosen-safety' into maintLibravatar Junio C Hamano1-4/+16
2011-05-04Merge branch 'ar/clean-rmdir-empty' into maintLibravatar Junio C Hamano1-0/+7
2011-05-04Merge branch 'mg/sha1-path-advise' into maintLibravatar Junio C Hamano1-5/+12
2011-05-04t5541-http-push: add test for chunkedLibravatar Tay Ray Chuan1-2/+16
2011-05-02Merge branch 'jk/notes-ui-updates'Libravatar Junio C Hamano1-0/+38
2011-05-02Merge branch 'ab/i18n-fixup'Libravatar Junio C Hamano36-363/+343
2011-05-02Merge branch 'nm/submodule-update-force'Libravatar Junio C Hamano1-0/+23
2011-05-02Merge branch 'jh/notes-add-ui'Libravatar Junio C Hamano1-2/+27
2011-05-02Merge branch 'mz/maint-rename-unmerged'Libravatar Junio C Hamano1-0/+62
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King1-2/+2
2011-04-29add tests for merge-index / merge-one-fileLibravatar Jeff King1-0/+100
2011-04-29t3701: Editing a split hunk in an "add -p" sessionLibravatar Junio C Hamano1-0/+36
2011-04-29gitweb: Restructure projects list generationLibravatar Jakub Narebski2-0/+123
2011-04-29Merge branch 'mg/x-years-12-months' into maintLibravatar Junio C Hamano1-0/+1
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone2-2/+12
2011-04-29t/test-lib.sh: minor readability improvementsLibravatar Mathias Lafeldt1-7/+9
2011-04-28Merge branch 'jc/diff-irreversible-delete'Libravatar Junio C Hamano1-1/+42
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Libravatar Junio C Hamano1-0/+25
2011-04-28Merge branch 'mz/rebase'Libravatar Junio C Hamano4-9/+88
2011-04-28Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-0/+63
2011-04-28Merge branch 'jh/dirstat'Libravatar Junio C Hamano6-7/+40
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong1-1/+31