7 Commits (01ae841ccf3aa5d5331a4e6aed6122fee6617740)

Author SHA1 Message Date
Nanako Shiraishi 0cb0e143ff tests: use "git xyzzy" form (t0000 - t3599) 16 years ago
Johannes Schindelin 51ef1daa4a Rename .git/rebase to .git/rebase-apply 17 years ago
Johannes Schindelin 28ed6e7b32 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" 17 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 18 years ago
Eric Wong 9a99c087da rebase: allow --merge option to handle patches merged upstream 19 years ago
Yann Dirson e77f489edf Add a test for rebase when a change was picked upstream 19 years ago