summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2008-07-15Merge branch 'mv/merge-in-c'Libravatar Junio C Hamano7-0/+371
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Libravatar Johannes Schindelin5-20/+20
2008-07-15t9600: allow testing with cvsps 2.2, including beta versionsLibravatar Pavel Roskin1-2/+2
2008-07-14Merge branch 'js/merge-rr'Libravatar Junio C Hamano1-3/+3
2008-07-14Merge branch 'ls/maint-mailinfo-patch-label'Libravatar Junio C Hamano6-1/+101
2008-07-14Merge branch 'om/rerere-careful'Libravatar Junio C Hamano1-6/+20
2008-07-14restore legacy behavior for read_sha1_file()Libravatar Nicolas Pitre1-0/+60
2008-07-14git-submodule - make "submodule add" more strict, and document itLibravatar Mark Levedahl1-1/+1
2008-07-14git-svn: find-rev and rebase for SVN::Mirror repositoriesLibravatar João Abecasis1-0/+9
2008-07-14reduce_heads(): protect from duplicate inputLibravatar Junio C Hamano1-0/+22
2008-07-13git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLibravatar Lukas Sandström6-1/+101
2008-07-13t3404: test two "preserve merges with -p" casesLibravatar Stephan Beyer1-5/+21
2008-07-13Merge branch 'maint' to sync with 1.5.6.3Libravatar Junio C Hamano2-9/+33
2008-07-13Merge branch 'am/stash-branch'Libravatar Junio C Hamano1-0/+60
2008-07-13Merge branch 'jc/report-tracking'Libravatar Junio C Hamano1-0/+70
2008-07-13Merge branch 'js/pick-root'Libravatar Junio C Hamano1-0/+30
2008-07-13Merge branch 'tr/add-i-e'Libravatar Junio C Hamano1-0/+67
2008-07-13reduce_heads(): thinkofixLibravatar Sverre Hvammen Johansen1-0/+11
2008-07-13Add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+46
2008-07-13t6021: add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+4
2008-07-13Move MERGE_RR from .git/rr-cache/ into .git/Libravatar Johannes Schindelin1-3/+3
2008-07-12t0004: fix timing bugLibravatar Junio C Hamano1-9/+10
2008-07-11Fix backwards-incompatible handling of core.sharedRepositoryLibravatar Petr Baudis1-0/+23
2008-07-10Teach merge.log to "git-merge" againLibravatar Junio C Hamano1-0/+7
2008-07-10builtin-rerere: more carefully find conflict markersLibravatar Olivier Marin1-6/+20
2008-07-09apply: fix copy/rename breakageLibravatar Junio C Hamano1-0/+20
2008-07-09Merge branch 'js/apply-root'Libravatar Junio C Hamano1-0/+43
2008-07-09t9100-git-svn-basic.sh: Fix determination of utf-8 localeLibravatar Ramsay Jones1-4/+4
2008-07-09t9113-*.sh: provide user feedback when test skippedLibravatar Ramsay Jones1-1/+7
2008-07-09Merge branch 'maint'Libravatar Junio C Hamano2-1/+26
2008-07-08Avoid apache complaining about lack of server's FQDNLibravatar Mike Hommey1-0/+1
2008-07-08Skip t5540-http-push test when USE_CURL_MULTI is undefinedLibravatar Mike Hommey1-0/+7
2008-07-08Fix http-push testLibravatar Mike Hommey2-9/+11
2008-07-08Catch failures from t5540-http-pushLibravatar Mike Hommey1-3/+4
2008-07-08t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objectsLibravatar Brandon Casey1-0/+34
2008-07-08Remove unnecessary pack-*.keep file after successful git-cloneLibravatar Shawn O. Pearce1-1/+19
2008-07-08avoid null SHA1 in oldest reflogLibravatar Jeff King1-1/+8
2008-07-08make deleting a missing ref more quietLibravatar Jeff King1-0/+7
2008-07-07Build in mergeLibravatar Miklos Vajna1-1/+1
2008-07-07Allow cherry-picking root commitsLibravatar Johannes Schindelin1-0/+30
2008-07-07Merge branch 'jc/rerere'Libravatar Junio C Hamano1-3/+13
2008-07-07Merge branch 'dr/ceiling'Libravatar Junio C Hamano4-4/+255
2008-07-06Add a test for "git stash branch"Libravatar Abhijit Menon-Sen1-0/+60
2008-07-06git-apply --directory: make --root more similar to GNU diffLibravatar Junio C Hamano1-4/+4
2008-07-06Fix t7601-merge-pull-config.sh on AIXLibravatar Miklos Vajna1-7/+7
2008-07-06Add new test case to ensure git-merge prepends the custom merge messageLibravatar Miklos Vajna1-0/+37
2008-07-05Fix apply --recount handling of no-EOL lineLibravatar Thomas Rast5-0/+28
2008-07-04Merge branch 'maint'Libravatar Junio C Hamano2-0/+0
2008-07-04Fix executable bits in t/ scriptsLibravatar Junio C Hamano2-0/+0
2008-07-04t4127-apply-same-fn: Avoid sed -iLibravatar Johannes Sixt1-11/+16