On Thu, Feb 20, 2014 at 08:35:33AM +0100, Ephrim Khong wrote:
> Hi, git log seems to omit merge commits that delete a file if --follow or
> --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired
> behaviour for --diff-filter=D, but it's probably not correct that --follow
> _removes_ the merge commit from the log output.
This is by design. Git-log does not calculate or show merge diffs unless
"-c" or "--cc" is specified, and thus no diff-filter can match.
> echo "log 1 - no output"
> # note that --diff-filter=A and M work as expected
> # the merge does not show up for --diff-filter=ACDMRTUXB either
> git log --pretty=oneline --diff-filter=D -- some_file
git log -c --diff-filter=D -- some_file
which does show it.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html