[PATCH] Documentation: improve description of "git reset --keep"
From: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
Documentation/git-reset.txt | 9 ++++++---
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::
--
1.7.0.1.307.g861f4
Christian Couder <chriscool@tuxfamily.org>