index 58d9b4c062d6d6d09f10fd2fad1edabddd961d92..645f0c17485d35e6696be950fc61f5fdcf3dd14e 100644 (file)
and the current commit in the working tree.
--keep::
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::
-p::
--patch::