From: Junio C Hamano Date: Tue, 9 Mar 2010 01:51:16 +0000 (+0100) Subject: Documentation: improve description of "git reset --keep" X-Git-Tag: v1.7.1-rc0~53^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eaf436c09c09a28804697c89f3ff9a7e1ad2361c;p=git.git Documentation: improve description of "git reset --keep" Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 58d9b4c06..645f0c174 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::