From: Ephrim Khong <dr.khong@gmail.com>
To: git@vger.kernel.org
Subject: Re: git log omits deleting merges
Date: Mon, 24 Mar 2014 11:25:32 +0100 [thread overview]
Message-ID: <5330081C.3090403@gmail.com> (raw)
In-Reply-To: <20140320195404.GA19252@sigill.intra.peff.net>
Am 20.03.14 20:54, schrieb Jeff King:
> 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.
Thank you for the explanation, I now understand why this is happening
from a technical point of view. From a usability perspective, it is a
bit confusing that a flag that should intuitively increase the number of
shown commits (--follow) removes a commit from the output. Though this
is just a minor annoyance, so no strong opinion here.
- Eph
next prev parent reply other threads:[~2014-03-24 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 7:35 git log omits deleting merges Ephrim Khong
2014-03-20 19:54 ` Jeff King
2014-03-20 22:56 ` Philip Oakley
2014-03-21 5:23 ` Jeff King
2014-03-24 10:25 ` Ephrim Khong [this message]
2014-03-24 14:19 ` Jeff King
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=5330081C.3090403@gmail.com \
--to=dr.khong@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.