On Wed, Sep 30, 2009 at 10:40:16PM +0200, Jakub Narebski wrote: > You can specify parent explicitely: "git diff <rev>^1 <rev>" for diff > to first parent, e.g. "git diff HEAD^ HEAD". > > Just so you know that this single diff is not enough to redo a merge. > It is only partial information. Yes certainly in some cases. Often you can pick specific patches and a few patches they depend on to try and fix something, but for bigger changes it doesn't work. I am actually surprised it has been this long before I ever saw one of these combined diff's. I must have been lucky so far. > BTW. there is also "git diff-tree -m <rev>") to show diff to *all* > parents at once: > > -m By default, `git-diff-tree --stdin` does not show differences for > merge commits. With this flag, it shows differences to that commit > from all of its parents. See also `-c`. I will have to try that one out. -- Len Sorensen -- 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