Documentation: improve description of "git reset --keep"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 9, 2010 at 02:51 UTC
eaf436c09c09a28804697c89f3ff9a7e1ad2361c
1 file changed
+6
-3
Documentation/git-reset.txt
+6
-3
@@ -53,9 +53,12 @@ OPTIONS
53
and the current commit in the working tree.
54
55
--keep::
56
- Resets the index to match the tree recorded by the named commit,
57
- but keep changes in the working tree. Aborts if the reset would
58
- change files that are already modified in the working tree.
56
+ Reset the index to the given commit, keeping local changes in
57
+ the working tree since the current commit, while updating
58
+ working tree files without local changes to what appears in
59
+ the given commit. If a file that is different between the
60
+ current commit and the given commit has local changes, reset
61
+ is aborted.
62
63
-p::
64
--patch::