aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-07
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-30
* | | | | | | | | | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-07
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-30
* | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2008-09-06
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | git-svn: set auto_props when renaming filesPaul Talacko2008-09-06
| * | | | | | | | | t9124: clean up chdir usageEric Wong2008-09-06
| * | | | | | | | | git-svn: fix 'info' tests for unknown itemsThomas Rast2008-09-05
| * | | | | | | | | git svn info: always quote URLs in 'info' outputThomas Rast2008-09-05
| * | | | | | | | | git svn info: make info relative to the current directoryThomas Rast2008-09-05
| * | | | | | | | | git svn info: tests: fix ptouch argument order in setupThomas Rast2008-09-05
| * | | | | | | | | git svn info: tests: use test_cmp instead of git-diffThomas Rast2008-09-05
| * | | | | | | | | git svn info: tests: do not use set -eThomas Rast2008-09-05
| * | | | | | | | | git svn info: tests: let 'init' test run with SVN 1.5Thomas Rast2008-09-05
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-09-06
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | "blame -c" should be compatible with "annotate"Junio C Hamano2008-09-05
* | | | | | | | Merge branch 'jc/maint-log-grep'Junio C Hamano2008-09-04
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | log --author/--committer: really match only with name partJunio C Hamano2008-09-04
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2008-09-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'nd/worktree' into maintJunio C Hamano2008-09-03
| |\ \ \ \ \ \
| | * | | | | | grep: fix worktree setupNguyễn Thái Ngọc Duy2008-08-28
| | * | | | | | diff*: fix worktree setupNguyễn Thái Ngọc Duy2008-08-28
| * | | | | | | Merge branch 'ho/dashless' into maintJunio C Hamano2008-09-03
| |\ \ \ \ \ \ \
| | * | | | | | | tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
| | * | | | | | | tests: use "git xyzzy" form (t7000 - t7199)Nanako Shiraishi2008-09-03
| | * | | | | | | tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-03
| | * | | | | | | tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-03
| | | |/ / / / / | | |/| | | | |
| * | | | | | | clone: fix creation of explicitly named target directoryClemens Buchacher2008-09-03
* | | | | | | | Merge branch 'tr/filter-branch'Junio C Hamano2008-09-02
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/post-simplify' into tr/filter-branchJunio C Hamano2008-08-12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Topo-sort before --simplify-mergesJunio C Hamano2008-08-03
| * | | | | | | | filter-branch: fix ref rewriting with --subdirectory-filterThomas Rast2008-08-12
| * | | | | | | | filter-branch: Extend test to show rewriting bugThomas Rast2008-08-12
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-09-02
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Bring local clone's origin URL in line with that of a remote cloneJohan Herland2008-09-01
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-30
| * | | | | | Merge branch 'sp/missing-thin-base' into maintJunio C Hamano2008-08-30
| |\ \ \ \ \ \
| | * | | | | | pack-objects: Allow missing base objects when creating thin packsShawn O. Pearce2008-08-12
| | |/ / / / /
| * | | | | | Merge branch 'np/verify-pack' into maintJunio C Hamano2008-08-29
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | pretty=format: respect date format optionsJeff King2008-08-29
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-27
|\ \ \ \ \
| * | | | | t7606: fix custom merge testJunio C Hamano2008-08-23
| * | | | | Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-29
| * | | | | Add a new test for using a custom merge strategyMiklos Vajna2008-07-29
* | | | | | Merge branch 'am/cherry-pick-rerere'Junio C Hamano2008-08-27
|\ \ \ \ \ \
| * | | | | | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-11
* | | | | | | Merge branch 'np/verify-pack'Junio C Hamano2008-08-27
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | discard revindex data when pack list changesNicolas Pitre2008-08-22