From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 07 Mar 2012 22:24:23 GMT
Subject: Re: [PATCH] Documentation/git-rerere: document 'remaining' command
Message-ID: <7vvcmgkq20.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABURp0rOFgwLu0pX0W5txOH=CH6Yb4NchYLaj91m1nMve_zjDg@mail.gmail.com>

Phil Hord <phil.hord@gmail.com> writes:

> 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.