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

path-restricted log vs. subtree merges

From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date
Mar 15, 2025, 14:45 UTC
Message-ID
<Z9WSbUQw4VBQiOqi@ugly>
in my quest to prepare for hacking git-gui, i ran
   cd .../git/git-gui
   git log .

the result is ... unhelpful. apart from a few commits that were done directly in the git repo, there are only merges. notably, there is no trace of the commits that are being merged (and the way gitk presents this partial log is even more unhelpful).

i'm speculating that this is the result of git log not handling the subtree merges in any way, with somewhat predictable consequences.

i suppose there is overlap with the fact that --follow works only for a single file, which is also unfortunate. (a recent test case in the repo would be templates/hooks.)

Next: Johannes Schindelin
Message 1 of 4 in “path-restricted log vs. subtree merges”
  1. Oswald BuddenhagenMar 15, 2025
  2. Johannes SchindelinMar 16, 2025
  3. Junio C HamanoMar 16, 2025
  4. Jeff KingMar 17, 2025

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.