These patches should address the current issues with rebase --merge usage. It can now do everything the original format-patch | am -3 strategy including --skip and detection of merged commits by upstream. -- Eric Wong - : 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