Am 02.02.12 12:41, schrieb David Barr:
On Thu, Feb 2, 2012 at 10:17 PM, Norbert Nemec
<norbert.nemec@xxxxxxxxxxxxxxxxxxxxx> 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...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html