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

On Mon, Mar 8, 2010 at 9:31 AM, Junio C Hamano [off-list ref] wrote:

Peter Baumann [off-list ref] writes:

quoted

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.