Carl Worth <cworth@cworth.org> writes: > Meanwhile, I still think it's worth re-considering the original > problem. Maybe you are misunderstanding something in a major way,... > After a failed merge, I get a multi-parent diff from "git > diff". However, after updating the index, I can't find any way to get > multi-parent diffs anymore. ... and that is exactly what this "unmerge to re-populate higher order stages" does. The multi-parent diff you have been looking at failed merge _is_ generated by comparing the higher order stages and your working tree file. > I'd still like to be able to do that, even when I know that what I > have in the index is good, and I don't want to undo it. You cannot it have both ways. Either you want to have the unmerged entries (so that you *can* view the combined diff), or you do not want to have them (then you obviously cannot view the combined diff between the working tree file and these stages). - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Apr 20 08:49:00 2006
This archive was generated by hypermail 2.1.8 : 2006-04-20 08:49:25 EST