From cca5d0b04aa78c048239a0d5c36174f04d6d7f3a Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 15 Sep 2010 22:47:41 +0200 Subject: [PATCH] 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 --- Documentation/git-reset.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index e4437404f3..8762a0c6b9 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 -- 2.11.4.GIT