From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.
Date: Tue, 24 Jan 2006 17:15:44 -0500 (EST) [thread overview]
Message-ID: <Pine.LNX.4.64.0601241655090.10804@evo.osdl.org> (raw)
In-Reply-To: <7vwtgqas0y.fsf@assigned-by-dhcp.cox.net>
On Tue, 24 Jan 2006, Junio C Hamano wrote:
>
> 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:
Thank you!
Can you make this the default for "git-whatchanged" too? That way, merges
that have manual fixups will actually show up in the whatchanged output.
Also, it would be perhaps even nicer if it had a "dense" version, which
only showed the chunks that had differences from more than one parent.
Chunks that have diffs from just one parent obviously had no conflicts in
that chunk, so they are much less interesting than a chunk that was
different from more than one parent..
Linus
next prev parent reply other threads:[~2006-01-24 22:16 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 [this message]
2006-01-25 2:08 ` Junio C Hamano
2006-01-25 12:35 ` Florian Weimer
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=Pine.LNX.4.64.0601241655090.10804@evo.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).