From: Jakub Narebski <jnareb@gmail.com>
To: Eli Barzilay <eli@barzilay.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>, git@vger.kernel.org
Subject: Re: Distinguishing trivial and non-trivial merge commits
Date: Sun, 02 May 2010 13:12:08 -0700 (PDT) [thread overview]
Message-ID: <m31vdugj2t.fsf@localhost.localdomain> (raw)
In-Reply-To: <19421.54064.178345.489772@winooski.ccs.neu.edu>
Eli Barzilay <eli@barzilay.org> writes:
> OK, thanks for clarifying that. For my purpose, I basically just want
> to know whether there was manual tweaking involved in the merge. (For
> my thing I don't even need to see those changes, since I show the
> overall push diff only.) What I ended up doing is pretty bad:
Well, the compact combined output is thought in such way that
"git diff --cc" should be empty except for evil merges, when change
comes from neither of parents. See description of --cc format in
git-diff(1) manpage.
The other side is "git diff --raw" output for merges.
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2010-05-02 20:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 16:35 Distinguishing trivial and non-trivial merge commits Eli Barzilay
2010-05-02 18:18 ` Jonathan Nieder
2010-05-02 19:32 ` Eli Barzilay
2010-05-02 20:12 ` Jakub Narebski [this message]
2010-05-02 21:03 ` Eli Barzilay
2010-05-02 23:07 ` Junio C Hamano
2010-05-02 23:23 ` Eli Barzilay
2010-05-02 20:29 ` Jonathan Nieder
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=m31vdugj2t.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=eli@barzilay.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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).