From: "norbert.nemec" <norbert.nemec@native-instruments.de>
To: git@vger.kernel.org
Subject: Re: How to find and analyze bad merges?
Date: Thu, 02 Feb 2012 13:10:06 +0100 [thread overview]
Message-ID: <jgduf8$mm3$1@dough.gmane.org> (raw)
In-Reply-To: <CAFfmPPMc1V97OPHyrZp+p4YUek1c6fCncyj0s1YU9xjxQBCsDA@mail.gmail.com>
Am 02.02.12 12:41, schrieb David Barr:
> On Thu, Feb 2, 2012 at 10:17 PM, Norbert Nemec
> <norbert.nemec@native-instruments.de> wrote:
>> To be yet more precise:
>>
>> My complaint is that you need this kind of sledge-hammer solutions to
>> analyze the situation. I, as an semi-expert with git did manage to find the
>> problem without even having to resort to bisect or manually redoing the
>> merge. My complaint is about the perspective of the medium-experienced user
>> who is completely puzzled by the fact that a
>> "git log<filename>" silently skips the critical merge commit.
>
> 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.
Indeed, these help somewhat. This way, the changes are not hidden, but
instead lost in the multitude of trivially-resolved conflicts...
prev parent reply other threads:[~2012-02-02 12:10 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
2012-02-02 12:16 ` norbert.nemec
2012-02-02 15:09 ` Neal Groothuis
2012-02-02 12:10 ` norbert.nemec [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='jgduf8$mm3$1@dough.gmane.org' \
--to=norbert.nemec@native-instruments.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).