Re: [PATCH 1/3] Documentation/stash: remove mention of git reset --hard
flat view
From: Jeff King <hidden>
Date: 2017-01-24 20:14:23
On Sat, Jan 21, 2017 at 08:08:02PM +0000, Thomas Gummerer wrote:
quoted hunk ↗ jump to hunk
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 also wondered if it was worth avoiding the word "revert", as "git revert" has a much different meaning (as opposed to "svn revert", which does what you're talking about here). But I see that "git add -i" already uses the word revert in this way (and there are probably others). So it may not be worth worrying about, but "set" or "reset" probably serves the same purpose. -Peff