Re: [PATCH] Documentation: reset: describe new "--keep" option

From: Christian Couder <chriscool@tuxfamily.org>
Date: Mar 7, 2010, 20:38 UTC
Message-ID: <201003072138.18583.chriscool@tuxfamily.org>
In-Reply-To: <7vaaukadap.fsf@alter.siamese.dyndns.org>

On Sunday 07 March 2010 06:52:46 Junio C Hamano wrote:

Show 14 quoted lines

> Christian Couder <chriscool@tuxfamily.org> writes:
> > and give an example to show how it can be used.
> >
> > Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
> > ---
> 
> Thanks.  With the example I think I can tell others that this at least has
> one known use case that is not totally whacky.
> 
> I haven't re-read Peter Baumann's comments that you dismissed as a
> mis-reading of your added documentation, but if somebody _can_ misread
> what you wrote, that is a sign that it has a room to be improved for
> clarity.

Ok, so instead of:

> +--keep::
> +     Resets the index to match the tree recorded by the named commit,
> +     but keep changes in the working tree. Aborts if the reset would
> +     change files that are already modified in the working tree.

what about:

--keep::
     Resets the index to match the tree recorded by the named commit,
     but changed files in the working tree are kept untouched. Aborts if the
     reset would touch any of them.

Thanks, Christian.