4 Commits (3f0a8f3c015f5f2502228a72d8c944d9e700c559)

Author SHA1 Message Date
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 19 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