On Sat, Apr 9, 2016 at 8:50 PM, Andi Kleen <ak@xxxxxxxxxxxxxxx> wrote:
>
> It doesn't work for git rebase at least. I had to fix up a lot of my
> WIP perf feature branches manually :-/
Actually, it does work for rebase, but rebase defaults to applying
patches because it's faster, and you might be rebasing lots and lots
of commits.
You should get the merging behavior with "-m" or "--merge". It's a lot
slower, but it can be worth it.
(And "a lot slower" is all relative. if you're rebasing just a couple
of patches it's not going to be all that noticeable. But if you're
rebasing hundreds or thousands of commits, you will definitely notice
the difference)
Linus
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html