git-reset.txt: reset --soft is not a no-op
Make it clearer that git reset --soft actually does something (changing HEAD). While it is mentioned in the previous paragraph already it can be easily overlooked otherwise. Also, git reset --soft does not look at the index nor the worktree, so there is no "good order" requirement. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Sep 15, 2010 at 22:47 UTC
cca5d0b04aa78c048239a0d5c36174f04d6d7f3a
1 file changed
+4
-4
Documentation/git-reset.txt
+4
-4
@@ -42,10 +42,10 @@ linkgit:git-add[1]).
42
+
43
--
44
--soft::
45
- Does not touch the index file nor the working tree at all, but
46
- requires them to be in a good order. This leaves all your changed
47
- files "Changes to be committed", as 'git status' would
48
- put it.
45
+ Does not touch the index file nor the working tree at all (but
46
+ resets the head to <commit>, just like all modes do). This leaves
47
+ all your changed files "Changes to be committed", as 'git status'
48
+ would put it.
49
50
--mixed::
51
Resets the index but not the working tree (i.e., the changed files