Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > That said, it's actually kind of sad that we don't expose a real > capability that the git plumbing does have. Namely > > git read-tree -u -m HEAD ORIG_HEAD I do not think this is quite enough. "read-tree --reset -u" is probably closer, but it may discard the entries added (and got conflicted) by the merge before actually updating the working tree (the right thing there would be to remove them). -- 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
