W dniu 24.01.2017 o 21:14, Jeff King pisze: > On Sat, Jan 21, 2017 at 08:08:02PM +0000, Thomas Gummerer wrote: > >> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt >> index 2e9cef06e6..0ad5335a3e 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 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. Best, -- Jakub Narębski
