summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-315-5/+151
|\
| * merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-181-1/+1
| * t6031: Add a testcase covering multiple renames across a D/F conflictElijah Newren2010-08-181-0/+31
| * Mark tests that use symlinks as needing SYMLINKS prerequisiteElijah Newren2010-08-122-3/+3
| * t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason2010-07-271-1/+1
| * fast-export: Fix output order of D/F changesElijah Newren2010-07-091-1/+1
| * merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-092-2/+2
| * merge-recursive: Fix D/F conflictsElijah Newren2010-07-091-3/+3
| * Add a rename + D/F conflict testcaseAlexander Gladysh2010-07-091-0/+35
| * Add additional testcases for D/F conflictsElijah Newren2010-07-092-4/+84
* | Merge branch 'jn/svn-fe'Junio C Hamano2010-08-312-0/+203
|\ \
| * | t/t9010-svn-fe.sh: add an +x bit to this testÆvar Arnfjörð Bjarmason2010-08-191-0/+0
| * | t9010 (svn-fe): avoid symlinks in testJonathan Nieder2010-08-141-1/+1
| * | t9010 (svn-fe): use Unix-style path in URIJonathan Nieder2010-08-141-1/+1
| * | SVN dump parserDavid Barr2010-08-141-0/+32
| * | Add stream helper libraryDavid Barr2010-08-141-0/+54
| * | Add string-specific memory poolDavid Barr2010-08-141-0/+16
| * | Add treap implementationJason Evans2010-08-141-0/+22
| * | Add memory pool libraryDavid Barr2010-08-141-0/+79
* | | Merge branch 'tr/maint-no-unquote-plus'Junio C Hamano2010-08-311-2/+8
|\ \ \
| * | | Do not unquote + into ' ' in URLsThomas Rast2010-07-251-2/+8
* | | | Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-311-0/+66
|\ \ \ \
| * | | | t7006 (pager): add missing TTY prerequisitesJonathan Nieder2010-08-161-2/+2
| * | | | Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fixJunio C Hamano2010-08-152-173/+452
| |\ \ \ \
| * | | | | config: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-0/+8
| * | | | | bundle: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-0/+33
| * | | | | apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-0/+3
| * | | | | grep: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-0/+13
| * | | | | shortlog: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-0/+9
* | | | | | Merge branch 'jn/maint-setup-fix'Junio C Hamano2010-08-312-173/+452
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | setup: do not forget working dir from subdir of gitdirNguyễn Thái Ngọc Duy2010-08-041-1/+1
| * | | | | t4111 (apply): refresh index before applying patches to itJonathan Nieder2010-08-041-1/+2
| * | | | | tests: try git apply from subdir of toplevelJonathan Nieder2010-07-251-0/+141
| * | | | | t1501 (rev-parse): clarifyJonathan Nieder2010-07-251-173/+310
| | |/ / / | |/| | |
* | | | | Merge branch 'en/fast-export-fix'Junio C Hamano2010-08-311-0/+14
|\ \ \ \ \
| * | | | | fast-export: Add a --full-tree optionElijah Newren2010-07-191-0/+5
| * | | | | fast-export: Fix dropping of files with --import-marks and path limitingElijah Newren2010-07-191-0/+9
* | | | | | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-311-8/+32
|\ \ \ \ \ \
| * | | | | | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-141-8/+32
* | | | | | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-311-3/+11
|\ \ \ \ \ \ \
| * | | | | | | rerere: fix overeager gcSZEDER Gábor2010-07-141-3/+11
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-291-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.7.1' into maintJunio C Hamano2010-08-291-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | t0003: add missing && at end of linesMatthieu Moy2010-08-291-5/+5
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | t3302 (notes): Port to SolarisJonathan Nieder2010-08-241-1/+1
* | | | | | | | | | t7610: cd inside subshell instead of aroundBrian Gernhardt2010-08-241-23/+26
* | | | | | | | | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-215-5/+107
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-114-12/+51
| * | | | | | | | | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-112-0/+63
| | |_|_|_|_|/ / / / | |/| | | | | | | |
View Lorry Controller Status