summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-09 01:51:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-09 02:16:05 (GMT)
commiteaf436c09c09a28804697c89f3ff9a7e1ad2361c (patch)
tree1beb41b9906d157b393df0f77aa71a62792f3d17 /Documentation/git-reset.txt
parent812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2 (diff)
downloadgit-eaf436c09c09a28804697c89f3ff9a7e1ad2361c.zip
git-eaf436c09c09a28804697c89f3ff9a7e1ad2361c.tar.gz
git-eaf436c09c09a28804697c89f3ff9a7e1ad2361c.tar.bz2
Documentation: improve description of "git reset --keep"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 58d9b4c..645f0c1 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -53,9 +53,12 @@ OPTIONS
and the current commit in the working tree.
--keep::
- Resets the index to match the tree recorded by the named commit,
- but keep changes in the working tree. Aborts if the reset would
- change files that are already modified in the working tree.
+ Reset the index to the given commit, keeping local changes in
+ the working tree since the current commit, while updating
+ working tree files without local changes to what appears in
+ the given commit. If a file that is different between the
+ current commit and the given commit has local changes, reset
+ is aborted.
-p::
--patch::