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

Re: [PATCH] Documentation/git-rerere: document 'remaining' command

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 7, 2012, 22:24 UTC
Message-ID
<7vvcmgkq20.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CABURp0rOFgwLu0pX0W5txOH=CH6Yb4NchYLaj91m1nMve_zjDg@mail.gmail.com>
Phil Hord <phil.hord@gmail.com> writes:
Show 11 quoted lines
> On Tue, Mar 6, 2012 at 2:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>>        'remaining'::
>>
>>        Print paths with conflicts that are not resolved.
>>
>> Should be sufficient, I think.
>
> ....  'mergetool' uses this command to
> avoid asking the user to resolve files which git rerere already
> resolved for her.

Ok, so "Print paths with conflicts that are not resolved." indeed is sufficient.

Previous: Phil HordNext: Phil Hord
Message 4 of 8 in “Documentation/git-rerere: document 'remaining' command”
  1. Documentation/git-rerere: document 'remaining' commandVincent van Ravesteijn, Mar 6, 2012
  2. Junio C HamanoMar 6, 2012
  3. Phil HordMar 7, 2012
  4. Junio C HamanoMar 7, 2012
  5. Phil HordMar 8, 2012
  6. Junio C HamanoMar 8, 2012
  7. Phil HordMar 8, 2012
  8. Junio C HamanoMar 8, 2012

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.