diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-15 14:56:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 14:56:41 -0800 |
| commit | 57f7345b50d3b546ad3f7f07306f1402a00c581b (patch) | |
| tree | 4c53b064feabb7b9561ae39d21fe520c00381d1b /Documentation | |
| parent | Merge branch 'jk/doc-submodule-markup-fix' (diff) | |
| parent | Documentation/stash: remove mention of git reset --hard (diff) | |
| download | tgif-57f7345b50d3b546ad3f7f07306f1402a00c581b.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stash.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 2e9cef06e6..2e9e344cd7 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 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 |