From: Florian Weimer <fw@deneb.enyo.de>
To: git@vger.kernel.org
Subject: Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.
Date: Wed, 25 Jan 2006 13:35:22 +0100 [thread overview]
Message-ID: <871wywzdrp.fsf@mid.deneb.enyo.de> (raw)
In-Reply-To: <7vwtgqas0y.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Tue, 24 Jan 2006 01:34:21 -0800")
* 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.
prev parent reply other threads:[~2006-01-25 12:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-24 9:34 [PATCH] diff-tree -c: show a merge commit a bit more sensibly Junio C Hamano
2006-01-24 22:15 ` Linus Torvalds
2006-01-25 2:08 ` Junio C Hamano
2006-01-25 12:35 ` Florian Weimer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871wywzdrp.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).