From: Michael J Gruber Date: Wed, 15 Sep 2010 20:47:41 +0000 (+0200) Subject: git-reset.txt: reset --soft is not a no-op X-Git-Tag: v1.7.3.3~29^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cca5d0b04aa78c048239a0d5c36174f04d6d7f3a;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index e4437404f..8762a0c6b 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -42,10 +42,10 @@ linkgit:git-add[1]). + -- --soft:: - Does not touch the index file nor the working tree at all, but - requires them to be in a good order. This leaves all your changed - files "Changes to be committed", as 'git status' would - put it. + Does not touch the index file nor the working tree at all (but + resets the head to , just like all modes do). This leaves + all your changed files "Changes to be committed", as 'git status' + would put it. --mixed:: Resets the index but not the working tree (i.e., the changed files