Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.

From: Florian Weimer <hidden>
Date: 2016-06-15 22:42:17

* 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 [off-list ref]
    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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help