Hi,
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.
(If you want to reproduce, the repository is git://git.torproject.org/
tor,
the string I'm looking for is "< DIGEST" and the first commit I hope to
find is ed87738ede789fb).
I presented the issue to #git, and it was suggested that it is probably
a pickaxe bug in that it doesn't display changes in merge commits if
they add strings that neither of their parents has.
Do you agree that this is a bug, or am I missing anything here?
Thanks for you consideration!
Sebastian
--
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