From: Florian Weimer <fw@deneb.enyo.de>
Date: Wed, 25 Jan 2006 12:35:22 GMT
Subject: Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.
Message-ID: <871wywzdrp.fsf@mid.deneb.enyo.de>
In-Reply-To: <7vwtgqas0y.fsf@assigned-by-dhcp.cox.net>

* Junio C. Hamano:

> A new option '-c' to diff-tree changes the way a merge commit is
> displayed when generating a patch output.  It shows a "combined
> diff" (hence the option letter 'c'), which looks like this:
>
>     $ git-diff-tree --pretty -c -p fec9ebf1 | head -n 18
>     diff-tree fec9ebf... (from parents)
>     Merge: 0620db3... 8a263ae...
>     Author: Junio C Hamano <junkio@cox.net>
>     Date:   Sun Jan 15 22:25:35 2006 -0800
>
> 	Merge fixes up to GIT 1.1.3
>
>     diff --combined describe.c
>     @@ +99,18 @@
>        }
>
>     -  static void describe(char *arg)
>      - static void describe(struct commit *cmit, int last_one)
>     ++ static void describe(char *arg, int last_one)

Maybe it would make sense to include a lines like these?

      #  0620db3... (Merge branch 'fix')
       # 8a263ae... (GIT 1.1.3)
      ## fec9ebf... (Merge fixes up to GIT 1.1.3)

This would make more clear which columns corresponds to which parent.