Re: [PATCH v2 1/4] Documentation/stash: remove mention of git reset --hard

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 30, 2017, 21:13 UTC
Message-ID: <xmqq7f5cuu8l.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170129201604.30445-2-t.gummerer@gmail.com>

Thomas Gummerer <t.gummerer@gmail.com> writes:

> Don't mention git reset --hard in the documentation for git stash save.
> It's an implementation detail that doesn't matter to the end user and
> thus shouldn't be exposed to them.

Everybody understands what "reset --hard" does; it can be an easier-to-read "short-hand" description to say "reset --hard" instead of giving a lengthy description of what happens.

Because of that, I do not necessarily agree with the above justification. I'll read the remainder of the series before commenting further on the above.

Show 12 quoted lines

> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 2e9cef06e6..0fc23c25ee 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -47,8 +47,9 @@ OPTIONS
>  
>  save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
>  
> -	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 roll them
> +	back both in the working tree and in the index.

"... roll them back both ..." is unclear where they are rolled back to.

Perhaps "roll them back ... to HEAD" or something?