"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > So really `revert`, `cherry-pick`, `rebase -m` (and also `am -3` > as it also uses merge-recursive) are all the same underlying > implementation. Minor factual correction. "am -3" uses merge-recursive *ONLY* when patch does not apply, so it is often the best of both worlds, as long as your changes do not involve renames. And that is what the default rebase uses. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
