2 Commits (be4a015b0fed2bd96e509f45b80b63db056b9ca9)

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