2 Commits (75dedd5a21246be03ae443e9fc6a9f75c6d2995b)

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