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

Re: Status of conflicted files resolved with rerere

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2010, 06:59 UTC
Message-ID
<7veie0gy3r.fsf@alter.siamese.dyndns.org>
In-Reply-To
<D06701C5-E581-46AA-BC7D-3DA7C4127D44@gmail.com>
David Aguilar <davvid@gmail.com> writes:
> Here's what we'd need in order to improve rerere and mergetool  
> interaction:  the ability to answer the question, "has this file been  
> rerere merged?"

I do not quite understand why the user _runs_ mergetool on a file that has been already merged; isn't it an option not to do so in the first place?

Having said that.
I think you can use the fact that:
 - "ls-files -u" will list paths with conflicts; and
 - "rerere status" won't mention the ones that have been autoresolved
if rerere is in effect (check for presense of .git/MERGE_RR).
Previous: David AguilarNext: Magnus Bäck
Message 5 of 16 in “Status of conflicted files resolved with rerere”
  1. Magnus BäckAug 12, 2010
  2. Avery PennarunAug 12, 2010
  3. Jay SoffianAug 13, 2010
  4. David AguilarAug 15, 2010
  5. Junio C HamanoAug 15, 2010
  6. Magnus BäckAug 15, 2010
  7. mergetool: Skip autoresolved pathsDavid Aguilar, Aug 17, 2010
  8. Thomas RastAug 19, 2010
  9. David AguilarAug 20, 2010
  10. Charles BaileyAug 20, 2010
  11. Jonathan NiederAug 20, 2010
  12. mergetool: Remove explicit references to /dev/ttyCharles Bailey, Aug 20, 2010
  13. Jonathan NiederAug 20, 2010
  14. Charles BaileyAug 20, 2010
  15. Jonathan NiederAug 20, 2010
  16. mergetool: Remove explicit references to /dev/ttyCharles Bailey, Aug 20, 2010

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.