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

Re: Code changes in merge commits

From
John Tapsell <johnflux@gmail.com>
Date
Sep 29, 2014, 11:02 UTC
Message-ID
<CAHQ6N+qGTubVB7F8LzfX=bODn6jdYtV9fz=RJ2fzS2aqhe5-uw@mail.gmail.com>
In-Reply-To
<vpq8ul2pu9n.fsf@anie.imag.fr>
Show 6 quoted lines
> What I'd love to see with "git log -p" is the diff between a trivial
> merge (possibly including conflict markers) and the actual merge commit.
> That would imply that "git log" would redo the merge before computing
> the diff (rather heavyweight :-( ), but an empty diff would mean "no
> change other than merge", and if any, we would see the conflict
> resolution or additional changes in the diff.

This would be wonderful. And I'd rather have git do the heavyweight work than doing it myself :-/

I don't know the git internals at all - would it be possible to "save" the results of the diff? This is what I was aiming for in my idea of making the merge and conflict-resolution as separate commits.

> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/
Previous: Matthieu MoyNext: Duy Nguyen
Message 4 of 5 in “Code changes in merge commits”
  1. John TapsellSep 29, 2014
  2. John TapsellSep 29, 2014
  3. Matthieu MoySep 29, 2014
  4. John TapsellSep 29, 2014
  5. Duy NguyenSep 29, 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.