45 ms·
Take a look at `--rebase-merges` if you haven't. It's new and kind of amazing. Works much better than `--preserve-merges` in my experience.
by phs2501 8y ago
Take a look at `--rebase-merges` if you haven't. It's new and kind of amazing. Works much better than `--preserve-merges` in my experience.
- yebyen 8y agoThanks! I meant to mention that --preserve-merges is not really for use with interactive rebase, and does not work at all with pull --rebase, but I was in a bit of a hurry. I did not know about rebase-merges! > The --rebase-merges mode is similar in spirit to --preserve-merges, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will.