diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-09 02:51:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 18:16:05 -0800 |
| commit | eaf436c09c09a28804697c89f3ff9a7e1ad2361c (patch) | |
| tree | 1beb41b9906d157b393df0f77aa71a62792f3d17 | |
| parent | reset: disallow using --keep when there are unmerged entries (diff) | |
| download | tgif-eaf436c09c09a28804697c89f3ff9a7e1ad2361c.tar.xz | |
Documentation: improve description of "git reset --keep"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | 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 58d9b4c062..645f0c1748 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:: |