Hi, On Mon, 26 Jan 2009, Daniel Barkalow wrote: > I was just doing an annoying merge (I'd reorganized code while other > people made changes to it), and I kept having the problem that it was hard > to figure out what each side had done. Is there some way to ask git for > the diffs between the common ancestor (which is unique in my case, so it's > actually useful) and each of the sides of the merge? How about git diff HEAD...MERGE_HEAD and git diff MERGE_HEAD...HEAD ? I might have misunderstood, though. Ciao, Dscho -- 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
