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

Re: git log omits deleting merges

From
Jeff King <peff@peff.net>
Date
Mar 21, 2014, 05:23 UTC
Message-ID
<20140321052312.GB31161@sigill.intra.peff.net>
In-Reply-To
<BC292A8591EF4E8AB1E553FBF6ECC336@PhilipOakley>
On Thu, Mar 20, 2014 at 10:56:58PM -0000, Philip Oakley wrote:
Show 10 quoted lines
> >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.
> 
> This is hard to discern from the log(1) man page as this conflates
> commit inclusion (limiting?) with the diff formatting.
> 
> The -c and -cc options are listed in the diff formatting section, but
> that's well down the man page. Even then, the note for the options doesn't
> say that it will cause the log output to now include the merge commits.

Merge commits are always considered. But we don't show merge _diffs_ without "-c" or "--cc". And they cannot match a diff-filter if we don't calculate the diffs.

That being said, I can certainly imagine there is room for improvement in the documentation. The --diff-filter option is in the "diff options" section, but perhaps the top of that section might want to make special mention of "-c" and "--cc"?

-Peff
Previous: Philip OakleyNext: Ephrim Khong
Message 4 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.