Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.
Show 19 quoted lines
> 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.