summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-157-0/+371
|\
| * reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-141-0/+22
| * reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-131-0/+11
| * Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46
| * t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+4
| * Teach merge.log to "git-merge" againJunio C Hamano2008-07-101-0/+7
| * Build in mergeMiklos Vajna2008-07-071-1/+1
| * Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-061-7/+7
| * Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-061-0/+37
| * Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna2008-06-301-0/+63
| * Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-301-0/+52
| * Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-301-0/+129
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-155-20/+20
* | t9600: allow testing with cvsps 2.2, including beta versionsPavel Roskin2008-07-151-2/+2
* | Merge branch 'js/merge-rr'Junio C Hamano2008-07-141-3/+3
|\ \
| * | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-131-3/+3
* | | Merge branch 'ls/maint-mailinfo-patch-label'Junio C Hamano2008-07-146-1/+101
|\ \ \
| * | | git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLukas Sandström2008-07-136-1/+101
* | | | Merge branch 'om/rerere-careful'Junio C Hamano2008-07-141-6/+20
|\ \ \ \ | | |/ / | |/| |
| * | | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-101-6/+20
* | | | restore legacy behavior for read_sha1_file()Nicolas Pitre2008-07-141-0/+60
* | | | git-submodule - make "submodule add" more strict, and document itMark Levedahl2008-07-141-1/+1
* | | | git-svn: find-rev and rebase for SVN::Mirror repositoriesJoão Abecasis2008-07-141-0/+9
* | | | t3404: test two "preserve merges with -p" casesStephan Beyer2008-07-131-5/+21
* | | | Merge branch 'maint' to sync with 1.5.6.3Junio C Hamano2008-07-132-9/+33
|\ \ \ \
| * | | | t0004: fix timing bugJunio C Hamano2008-07-121-9/+10
| | |/ / | |/| |
| * | | Fix backwards-incompatible handling of core.sharedRepositoryPetr Baudis2008-07-111-0/+23
* | | | Merge branch 'am/stash-branch'Junio C Hamano2008-07-131-0/+60
|\ \ \ \
| * | | | Add a test for "git stash branch"Abhijit Menon-Sen2008-07-061-0/+60
* | | | | Merge branch 'jc/report-tracking'Junio C Hamano2008-07-131-0/+70
|\ \ \ \ \
| * | | | | stat_tracking_info(): clear object flags used during countingJunio C Hamano2008-07-031-0/+70
| |/ / / /
* | | | | Merge branch 'js/pick-root'Junio C Hamano2008-07-131-0/+30
|\ \ \ \ \
| * | | | | Allow cherry-picking root commitsJohannes Schindelin2008-07-071-0/+30
* | | | | | Merge branch 'tr/add-i-e'Junio C Hamano2008-07-131-0/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | git-add--interactive: manual hunk editing modeThomas Rast2008-07-021-0/+67
* | | | | | apply: fix copy/rename breakageJunio C Hamano2008-07-091-0/+20
* | | | | | Merge branch 'js/apply-root'Junio C Hamano2008-07-091-0/+43
|\ \ \ \ \ \
| * | | | | | git-apply --directory: make --root more similar to GNU diffJunio C Hamano2008-07-061-4/+4
| * | | | | | apply --root: thinkofix.Junio C Hamano2008-07-021-2/+13
| * | | | | | Teach "git apply" to prepend a prefix with "--root=<root>"Johannes Schindelin2008-07-011-0/+32
| | |_|_|_|/ | |/| | | |
* | | | | | t9100-git-svn-basic.sh: Fix determination of utf-8 localeRamsay Jones2008-07-091-4/+4
* | | | | | t9113-*.sh: provide user feedback when test skippedRamsay Jones2008-07-091-1/+7
* | | | | | Merge branch 'maint'Junio C Hamano2008-07-092-1/+26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove unnecessary pack-*.keep file after successful git-cloneShawn O. Pearce2008-07-081-1/+19
| * | | | | make deleting a missing ref more quietJeff King2008-07-081-0/+7
* | | | | | Avoid apache complaining about lack of server's FQDNMike Hommey2008-07-081-0/+1
* | | | | | Skip t5540-http-push test when USE_CURL_MULTI is undefinedMike Hommey2008-07-081-0/+7
* | | | | | Fix http-push testMike Hommey2008-07-082-9/+11
* | | | | | Catch failures from t5540-http-pushMike Hommey2008-07-081-3/+4
* | | | | | t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objectsBrandon Casey2008-07-081-0/+34
View Lorry Controller Status