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

Common ancestor in merge diffs?

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Jan 26, 2009, 18:41 UTC
Message-ID
<alpine.LNX.1.00.0901261318030.19665@iabervon.org>

I was just doing an annoying merge (I'd reorganized code while other people made changes to it), and I kept having the problem that it was hard to figure out what each side had done. Is there some way to ask git for the diffs between the common ancestor (which is unique in my case, so it's actually useful) and each of the sides of the merge? Ideally, it would give essentially the converse of the --cc diff: first column is -stage 1 +stage 2; second column is -stage 1 +stage 3.

I think this would generally be more useful than the current diff output for the unresolved portions (-stage 3 +working tree, -stage 2 +working tree) because you're generally quite familiar with the working tree (since you're trying to resolve there), and stage 1 is not obvious.

	-Daniel
*This .sig left intentionally blank*
Next: Johannes Schindelin
Message 1 of 7 in “Common ancestor in merge diffs?”
  1. Daniel BarkalowJan 26, 2009
  2. Johannes SchindelinJan 26, 2009
  3. Daniel BarkalowJan 26, 2009
  4. Linus TorvaldsJan 26, 2009
  5. Daniel BarkalowJan 26, 2009
  6. Linus TorvaldsJan 26, 2009
  7. Junio C HamanoJan 26, 2009

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.