Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes: > This type of request comes up often (for a reason). I'm wondering > whether we could support it more systematically, either by exposing the > steps above as a command, or by storing the unresolved merge somewhere > (leveraging stash or rerere). Perhaps 'tr/remerge-diff' (on 'pu') is of interest? -- 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