git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Ephrim Khong <dr.khong@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git log omits deleting merges
Date: Mon, 24 Mar 2014 10:19:34 -0400	[thread overview]
Message-ID: <20140324141934.GA651@sigill.intra.peff.net> (raw)
In-Reply-To: <5330081C.3090403@gmail.com>

On Mon, Mar 24, 2014 at 11:25:32AM +0100, Ephrim Khong wrote:

> 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.

Sorry, I focused on the --diff-filter aspect of your question. As for
--follow, I think that is less "by design" and more "what happens to
occur, because --follow is a bit of a hack".

So there may be a bug, or room for improvement in the code there, though
if the solution involves turning on diffs for all merges, that may be
prohibitively expensive.

-Peff

      reply	other threads:[~2014-03-24 14:19 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
2014-03-24 14:19     ` Jeff King [this message]

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=20140324141934.GA651@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).