Sebastian Hahn wrote:
>
> I quite like gitk and am a fan of the ability to easily locate commits
> where a specific string was added/removed. If the string in question
> was added in a merge commit as part of a conflicted/otherwise
> changed merge, gitk doesn't display it.
[...]
> I presented the issue to #git, and it was suggested that it is probably
> a pickaxe bug
In particular, in a history where
$ git show HEAD:foo
quux
$ git show HEAD^:foo
bar
$ git show HEAD^2:foo
baz
the behaviour is:
git log -Squux # empty
git log -Squux -p # empty
git log -Squux --pickaxe-all # empty
git log -Squux -c # shows merge, but no diff
git log -Squux --cc # shows merge, but no diff
git log -Squux -c -p # shows merge, but no diff
git log -Squux -c --pickaxe-all # shows merge, but no diff
git log -Squux --pickaxe-all -c -p # shows merge & combined diff
So it only shows the diff with --pickaxe-all, even though the (only)
hunk clearly introduced the string.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
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