Sometimes I'd like to repeat a previously performed merge, preserving the commit message. And, if possible, the conflict resolutions. "git cherry-pick -m 1 <commit>" gets me the changes, but makes an ordinary single-parent commit, not a merge. "git rebase -p --onto HEAD commit^ commit" does the right thing, but has two annoying properties: 1) It actually checks out "commit", then goes back to HEAD, thus forcing a lot of recompiltion of source files that experience no net change from the operation. 2) Because it's intended for multi-step use, it stops and waits for confirmation if there are rerere changes. I'd rather it just did the commit if there are no remaining conflict markers, and I'll reset or amend it if I'm not happy with the result. Does something like this exist already? Thank you! -- 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