Merge branch 'tg/stash-doc-cleanup'

The documentation explained what "git stash" does to the working
tree (after stashing away the local changes) in terms of "reset
--hard", which was exposing an unnecessary implementation detail.

* tg/stash-doc-cleanup:
Documentation/stash: remove mention of git reset --hard

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 2e9cef06e64376e973eeb74e338d93dd99ae40ee..2e9e344cd757674a655579c6c58569ff19a6f22e 100644 (file)
--- 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 to HEAD (in the working tree and in the index).
+       The <message> part is optional and gives
        the description along with the stashed state.  For quickly making
        a snapshot, you can omit _both_ "save" and <message>, but giving
        only <message> does not trigger this action to prevent a misspelled