development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation: improve description of "git reset --keep"

Browse source 
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-03-09 02:51:16 +01:00
parent 812d2a3d61
commit eaf436c09c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Documentation/git-reset.txt
View file

@ -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::