From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jan 2017 21:20:53 GMT
Subject: Re: [PATCH 1/3] Documentation/stash: remove mention of git reset --hard
Message-ID: <xmqqbmuualai.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <d327cfc5-2f0d-1a67-d5f5-b9b7a06f7570@gmail.com>

Jakub Narębski <jnareb@gmail.com> writes:

>>> -	Save your local modifications to a new 'stash', and run `git reset
>>> -	--hard` to revert them.  The <message> part is optional and gives
>>> +	Save your local modifications to a new 'stash', and revert the
>>> +	the changes in the working tree to match the index.
>>> +	The <message> part is optional and gives
>> 
>> Hrm. "git reset --hard" doesn't just make the working tree match the
>> index. It also resets the index to HEAD.  So either the original or your
>> new description is wrong.
>> 
>> I think it's the latter. We really do reset the index unless
>> --keep-index is specified.
>
> I wonder if it is worth mentioning that "saving local modifications"
> in 'git stash' means storing both the state of the worktree (of tracked
> files in it) _and_ the state of the index, before both get set to
> state of HEAD.

Yes, it is, I would say.