From: Jonathan Nieder <jrnieder@gmail.com>
To: David Barr <davidbarr@google.com>
Cc: Norbert Nemec <norbert.nemec@native-instruments.de>,
Thomas Rast <trast@inf.ethz.ch>,
git@vger.kernel.org
Subject: Re: How to find and analyze bad merges?
Date: Thu, 2 Feb 2012 06:03:40 -0600 [thread overview]
Message-ID: <20120202120340.GA25190@burratino> (raw)
In-Reply-To: <CAFfmPPMc1V97OPHyrZp+p4YUek1c6fCncyj0s1YU9xjxQBCsDA@mail.gmail.com>
David Barr wrote:
> Do the -c --cc or -m flags for git log help in this case?
> They alter the way merge diffs are presented, as described under Diff Formatting
> in the git-log(1) man page.
I suspect Norbert was running into history simplification, so the --full-history
flag would be the relevant one.
See the thread [1] for a few relevant side-notes.
[1] http://thread.gmane.org/gmane.comp.version-control.git/188904
next prev parent reply other threads:[~2012-02-02 12:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 8:10 How to find and analyze bad merges? norbert.nemec
2012-02-02 8:16 ` Junio C Hamano
2012-02-02 9:01 ` norbert.nemec
2012-02-02 20:09 ` Junio C Hamano
2012-02-02 10:05 ` norbert.nemec
[not found] ` <87haz97c2k.fsf@thomas.inf.ethz.ch>
2012-02-02 11:17 ` Norbert Nemec
2012-02-02 11:41 ` David Barr
2012-02-02 12:03 ` Jonathan Nieder [this message]
2012-02-02 12:16 ` norbert.nemec
2012-02-02 15:09 ` Neal Groothuis
2012-02-02 12:10 ` norbert.nemec
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=20120202120340.GA25190@burratino \
--to=jrnieder@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=norbert.nemec@native-instruments.de \
--cc=trast@inf.ethz.ch \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.