Jeff King <peff@xxxxxxxx> writes: > One more wishlist item for this. I use "add -p" for almost all of my > adds these days, because I like the final review check. So after a > conflicted merge, I find myself doing "add -p" to stage my resolution. > The current behavior is that it shows the --cc diff and exits. It would > be cool to handle staging the resolution, which would involve converting > the combined diff into something that can be applied. I think the end-result would be a nice feature. I suspect that it would not involve conversion from --cc, but more like using the difference between the HEAD and the working tree, generated as if there is no multi-stage index. -- 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