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

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 8, 2010, 08:31 UTC
Message-ID: <7v3a0b1afe.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100306081034.GA4827@m62s10.vlinux.de>

Peter Baumann <waste.manager@gmx.de> writes:

Show 11 quoted lines

> On Fri, Mar 05, 2010 at 09:25:36PM +0100, Christian Couder wrote:
>> and give an example to show how it can be used.
>> 
>> +--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.
>> +
>  
> Huh? Keep changes (by not touching the worktree) and then aborting if we
> touch the worktree. Seems like a contradiction to me.

Here is my try...

    Reset the index to the given commit, keeping local changes in the working
    tree since the current commit, while updating working tree files without
    local changes to what appears in the given commit.  If a file that is
    different between the current commit and the given commit has local
    changes, reset is aborted.