From: Philippe Vaucher <philippe.vaucher@gmail.com>
Date: Wed, 23 Nov 2011 11:39:39 GMT
Subject: Re: git reset --merge documentation improvments
Message-ID: <CAGK7Mr4UGc3jx2AQpRK_sotWHU-ibmGz87jx4hi-==8qY04QOg@mail.gmail.com>
In-Reply-To: <4ECCB565.9020706@lyx.org>

>> "Updates the files in the working tree that are different between
>> <commit>  and HEAD, but keeps those which are different between the
>> index and working tree, and finally resets the index."
>
> There is nothing to update as long as the index is not reset.

Well then I simply don't understand what --merge does. Is it like
--keep but instead of failing when a file-to-be-overwritten has
changes it simply ignores the overwriting and continues?

Philippe