Re: [PATCH] rerere.txt: Document forget subcommand

From: Jay Soffian <jaysoffian@gmail.com>
Date: Jun 15, 2010, 16:45 UTC
Message-ID: <AANLkTinfDixTH_l_1quVg68oz4E0AeuuyyOAVrJ2liVz@mail.gmail.com>
In-Reply-To: <7vr5k86ylg.fsf@alter.siamese.dyndns.org>

On Tue, Jun 15, 2010 at 12:37 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

>> +'forget' <pathspec>::
>> +
>> +This resets the conflict resolutions which rerere has recorded for <pathspec>.
>> +
>
> This description is not _incorrect_ per-se, but it does not convey one
> important aspect of the subcommand; unlike "clear" and "gc", "forget" only
> works in the context of the _current_ conflict resolution, just like
> "diff" and "status".
>
> Perhaps s/for <pathspec>/for the current conflict in <pathspec>/ would be
> a sufficient improvement?

Also, pathspec is optional.

j.