global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/reset-keep' into next

Browse Source 
* cc/reset-keep:
  Documentation: improve description of "git reset --keep"
This commit is contained in:
Junio C Hamano
2010-03-08 18:31:35 -08:00
parent 0697bf4a87 eaf436c09c
commit 015ef4b25a
1 changed files with 6 additions and 3 deletions
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::