From: Christian Couder <christian.couder@gmail.com>
Date: Mon, 08 Mar 2010 11:31:51 GMT
Subject: Re: [PATCH] Documentation: reset: describe new "--keep" option
Message-ID: <c07716ae1003080331j16cc29d5j6f6c1d7e940d03b8@mail.gmail.com>
In-Reply-To: <7v3a0b1afe.fsf@alter.siamese.dyndns.org>

On Mon, Mar 8, 2010 at 9:31 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Peter Baumann <waste.manager@gmx.de> writes:
>
>> 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.

I agree that it is better. I will post a patch with this change this
evening if you don't do it before.

Thanks,
Christian.