summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2008-09-0378-517/+595
|\
| * Merge branch 'nd/worktree' into maintJunio C Hamano2008-09-031-2/+62
| |\
| | * grep: fix worktree setupNguyễn Thái Ngọc Duy2008-08-281-0/+5
| | * diff*: fix worktree setupNguyễn Thái Ngọc Duy2008-08-281-2/+57
| * | Merge branch 'ho/dashless' into maintJunio C Hamano2008-09-0376-515/+515
| |\ \
| | * | tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-0318-99/+99
| | * | tests: use "git xyzzy" form (t7000 - t7199)Nanako Shiraishi2008-09-036-183/+183
| | * | tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-0326-130/+130
| | * | tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-0326-103/+103
| * | | clone: fix creation of explicitly named target directoryClemens Buchacher2008-09-031-0/+18
* | | | Merge branch 'tr/filter-branch'Junio C Hamano2008-09-022-2/+99
|\ \ \ \
| * \ \ \ Merge branch 'jc/post-simplify' into tr/filter-branchJunio C Hamano2008-08-121-0/+93
| |\ \ \ \
| | * | | | Topo-sort before --simplify-mergesJunio C Hamano2008-08-031-0/+93
| * | | | | filter-branch: fix ref rewriting with --subdirectory-filterThomas Rast2008-08-121-1/+1
| * | | | | filter-branch: Extend test to show rewriting bugThomas Rast2008-08-121-3/+7
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-021-3/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Bring local clone's origin URL in line with that of a remote cloneJohan Herland2008-09-011-3/+3
* | | | | | Merge branch 'maint'Junio C Hamano2008-08-302-3/+92
|\ \ \ \ \ \ | |/ / / / /
| * | | | | git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-301-3/+12
| * | | | | Merge branch 'sp/missing-thin-base' into maintJunio C Hamano2008-08-301-0/+80
| |\ \ \ \ \
| | * | | | | pack-objects: Allow missing base objects when creating thin packsShawn O. Pearce2008-08-121-0/+80
| | |/ / / /
| * | | | | Merge branch 'np/verify-pack' into maintJunio C Hamano2008-08-291-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2008-08-291-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | pretty=format: respect date format optionsJeff King2008-08-291-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-272-0/+53
|\ \ \ \ \
| * | | | | t7606: fix custom merge testJunio C Hamano2008-08-231-2/+5
| * | | | | Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-291-0/+4
| * | | | | Add a new test for using a custom merge strategyMiklos Vajna2008-07-291-0/+46
* | | | | | Merge branch 'am/cherry-pick-rerere'Junio C Hamano2008-08-271-0/+45
|\ \ \ \ \ \
| * | | | | | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-111-0/+45
* | | | | | | Merge branch 'np/verify-pack'Junio C Hamano2008-08-271-0/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | discard revindex data when pack list changesNicolas Pitre2008-08-221-0/+6
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-264-10/+26
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Suppress some bash redirection error messagesRamsay Jones2008-08-263-10/+4
| * | | | | | Fix "git log -i --grep"Jeff King2008-08-241-0/+22
* | | | | | | format-patch: use default diff format even with patch optionsJeff King2008-08-261-0/+25
* | | | | | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-244-1/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-241-0/+16
| |\ \ \ \ \ \
| | * | | | | | Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-231-0/+16
| | |/ / / / /
| * | | | | | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-233-1/+23
| |/ / / / /
* | | | | | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-221-1/+22
* | | | | | filter-branch: Grok special characters in tag namesJohannes Sixt2008-08-211-0/+8
* | | | | | test-lib: do not remove trash_directory if called with --debugJohannes Schindelin2008-08-211-1/+1
* | | | | | Merge branch 'jc/add-stop-at-symlink'Junio C Hamano2008-08-201-0/+25
|\ \ \ \ \ \
| * | | | | | add: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-041-1/+6
| * | | | | | update-index: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-041-0/+20
* | | | | | | Merge branch 'kh/diff-tree'Junio C Hamano2008-08-201-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Add test for diff-tree --stdin with two treesKarl Hasselström2008-08-111-0/+14
* | | | | | | | Merge branch 'mg/count-objects'Junio C Hamano2008-08-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | count-objects: Add total pack size to verbose outputMarcus Griep2008-08-171-1/+1