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

Re: [RFC/PATCH] Add git-unresolve <paths>...

From
Junio C Hamano <junkio@cox.net>
Date
Apr 19, 2006, 22:48 UTC
Message-ID
<7vk69l5gi1.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<87wtdl2o5o.wl%cworth@cworth.org>
Carl Worth <cworth@cworth.org> writes:
> Meanwhile, I still think it's worth re-considering the original
> problem. 
Maybe you are misunderstanding something in a major way,...
> After a failed merge, I get a multi-parent diff from "git
> diff". However, after updating the index, I can't find any way to get
> multi-parent diffs anymore.

... and that is exactly what this "unmerge to re-populate higher order stages" does. The multi-parent diff you have been looking at failed merge _is_ generated by comparing the higher order stages and your working tree file.

> I'd still like to be able to do that, even when I know that what I
> have in the index is good, and I don't want to undo it.

You cannot it have both ways. Either you want to have the unmerged entries (so that you *can* view the combined diff), or you do not want to have them (then you obviously cannot view the combined diff between the working tree file and these stages).

Previous: Carl WorthNext: Carl Worth
Message 7 of 11 in “Add git-unresolve <paths>...”
  1. Add git-unresolve <paths>...Junio C Hamano, Apr 19, 2006
  2. Carl WorthApr 19, 2006
  3. Junio C HamanoApr 19, 2006
  4. git-merge: a bit more readable user guidance.Junio C Hamano, Apr 19, 2006
  5. pre-commit hook: complain about conflict markers.Junio C Hamano, Apr 19, 2006
  6. Carl WorthApr 19, 2006
  7. Junio C HamanoApr 19, 2006
  8. Carl WorthApr 20, 2006
  9. Junio C HamanoApr 19, 2006
  10. Carl WorthApr 20, 2006
  11. Junio C HamanoApr 20, 2006

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.