X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-reset.txt;h=c8d175768cc665533517952fc613279b42e47f18;hb=07e2fbcb90bf0fc53bc67b970704730832c6d3d4;hp=a4e0a779de6a8e2de7ec9012bc66f15ca351e2aa;hpb=105c21df14531bf2fd39e05b4c3a9aa31349da06;p=git.git diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a4e0a779d..c8d175768 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 ----------- @@ -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 'git-status' would put it. --hard:: @@ -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 @@ -186,4 +203,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite