summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-17 01:41:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-17 01:41:23 (GMT)
commit413b90f0da613b4edeb6259e04c7dc36b703bc3b (patch)
treec34841d86b6358d1e3720e3005b738cec08ae839 /Documentation
parente7e5170f80431c3d7855e055d9bb6f4e4e6ccc64 (diff)
parent965053b09a2de5687b9098cb05edc9bfbf1d26b3 (diff)
downloadgit-413b90f0da613b4edeb6259e04c7dc36b703bc3b.zip
git-413b90f0da613b4edeb6259e04c7dc36b703bc3b.tar.gz
git-413b90f0da613b4edeb6259e04c7dc36b703bc3b.tar.bz2
Merge branch 'maint'
* maint: Documentation/git-reset: Add an example of resetting selected paths Documentation/git-reset: don't mention --mixed for selected-paths reset Documentation/git-reset:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-reset.txt23
1 files changed, 20 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index a4e0a77..fac59c9 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] [<commit>]
-'git-reset' [--mixed] [-q] [<commit>] [--] <paths>...
+'git reset' [--mixed | --soft | --hard] [-q] [<commit>]
+'git reset' [-q] [<commit>] [--] <paths>...
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 linkgit:git-status[1] 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 <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org>