2 Commits (ab41dfbfd4f3f9fedac71550027e9813b11abe3d)

Author SHA1 Message Date
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