From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Sep 2010 23:19:57 GMT
Subject: Re: [PATCH 3/6] git-reset.txt: reset --soft is not a no-op
Message-ID: <7v39tdb59e.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTin1Ht+2Q4v5pyt8p11VmQ275C41rJLMLLuLkEfA@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:

> On Mon, Sep 13, 2010 at 4:06 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Make it clearer that git reset --soft actually does something (changing
>> HEAD). While it is meantioned in the previous paragraph already it can
>> be easily overlooked otherwise.
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>>  Documentation/git-reset.txt |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
>> index 8fb871c..65f5d07 100644
>> --- a/Documentation/git-reset.txt
>> +++ b/Documentation/git-reset.txt
>> @@ -43,7 +43,8 @@ linkgit:git-add[1]).
>>  --
>>  --soft::
>>        Does not touch the index file nor the working tree at all, but
>> -       requires them to be in a good order. This leaves all your changed
>> +       requires them to be in good order (and sets the head to <commit>,
>> +       just like all modes do). This leaves all your changed
>>        files "Changes to be committed", as 'git status' would
>>        put it.
>
> What does "requires them to be in good order" mean anyway?

Good point.  I don't think it means anything now; for that matter I do not
think it meant anything even back when that sentence was added in f67545e
(Docs for git-reset-script., 2005-09-07).  A soft reset doesn't even look
at the index nor the working tree, so there is no good nor bad order
there.

Just remove it.