From 3983caa531d31b2b95647ae60ac23a0e12385718 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 16 Feb 2008 10:38:12 -0800 Subject: [PATCH 1/3] Documentation/git-reset: Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a4e0a779de..b6bcf4d9de 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -37,7 +37,7 @@ OPTIONS --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 "Added but not yet committed", as linkgit:git-status[1] would + files "Changes to be committed", as linkgit:git-status[1] would put it. --hard:: From ceb4cacb42d16e098672d395050f9e61345c4a19 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Sat, 16 Feb 2008 17:48:45 +0100 Subject: [PATCH 2/3] Documentation/git-reset: don't mention --mixed for selected-paths reset The option is accepted, but that is the only form selected-paths variant of the reset command takes, so there is no point mentioning it. And while we're at it, use the dashless git call. Signed-off-by: Pieter de Bie Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index b6bcf4d9de..32fd7fe2e6 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -8,8 +8,8 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git-reset' [--mixed | --soft | --hard] [-q] [] -'git-reset' [--mixed] [-q] [] [--] ... +'git reset' [--mixed | --soft | --hard] [-q] [] +'git reset' [-q] [] [--] ... DESCRIPTION ----------- From 965053b09a2de5687b9098cb05edc9bfbf1d26b3 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Sat, 16 Feb 2008 17:48:46 +0100 Subject: [PATCH 3/3] Documentation/git-reset: Add an example of resetting selected paths Signed-off-by: Pieter de Bie Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 32fd7fe2e6..fac59c9726 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -176,6 +176,23 @@ $ git reset <3> committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted. +Reset a single file in the index:: ++ +Suppose you have added a file to your index, but later decide you do not +want to add it to your commit. You can remove the file from the index +while keeping your changes with git reset. ++ +------------ +$ git reset -- frotz.c <1> +$ git commit -m "Commit files in index" <2> +$ git add frotz.c <3> +------------ ++ +<1> This removes the file from the index while keeping it in the working + directory. +<2> This commits all other changes in the index. +<3> Adds the file to the index again. + Author ------ Written by Junio C Hamano and Linus Torvalds