git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git log omits deleting merges

From
Ephrim Khong <dr.khong@gmail.com>
Date
Mar 24, 2014, 10:25 UTC
Message-ID
<5330081C.3090403@gmail.com>
In-Reply-To
<20140320195404.GA19252@sigill.intra.peff.net>
Am 20.03.14 20:54, schrieb Jeff King:
Show 9 quoted lines
> 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
Previous: Jeff KingNext: Jeff King
Message 5 of 6 in “git log omits deleting merges”
  1. Ephrim KhongFeb 20, 2014
  2. Jeff KingMar 20, 2014
  3. Philip OakleyMar 20, 2014
  4. Jeff KingMar 21, 2014
  5. Ephrim KhongMar 24, 2014
  6. Jeff KingMar 24, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.