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

Re: gitk "find commit adding/removing string"/possible pickaxe bug?

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 18, 2011, 18:39 UTC
Message-ID
<7v8vyikqdg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201101181744.18139.trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
>   git log -Squux --pickaxe-all -c -p  # shows merge & combined diff
>
> So it only shows the diff with --pickaxe-all, even though the (only)
> hunk clearly introduced the string.

Isn't it just because unless you ask for -m to get all the pairwise diff between each parent and the merged child the diff machinery won't kick in for merge commits? I didn't check the option defaulting logic, but there may be something that changes the default setting of "-m" among your examples.

Previous: Thomas RastNext: Jeff King
Message 3 of 10 in “gitk "find commit adding/removing string"/possible pickaxe bug?”
  1. Sebastian HahnJan 18, 2011
  2. Thomas RastJan 18, 2011
  3. Junio C HamanoJan 18, 2011
  4. Jeff KingJan 18, 2011
  5. Thomas RastJan 18, 2011
  6. Jeff KingJan 18, 2011
  7. Junio C HamanoJan 18, 2011
  8. Jeff KingJan 18, 2011
  9. Jeff KingJan 31, 2011
  10. Thomas RastJan 18, 2011

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.