Skip to content

Commit

Permalink
Documentation: improve description of "git reset --keep"
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 9, 2010
1 parent 812d2a3 commit eaf436c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Documentation/git-reset.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down

0 comments on commit eaf436c

Please sign in to comment.