diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-26 00:21:01 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 00:21:01 -0800 |
commit | 6934dec89538e054823aadcce08af040bc8dcf79 (patch) | |
tree | 26914c37d128c3475596b989265e03f10242c54b /Documentation/git-reset.txt | |
parent | 2f89543eaf98400d72498078d762c10e240c0657 (diff) | |
download | git-6934dec89538e054823aadcce08af040bc8dcf79.tar.gz |
Document git-reset <commit> -- <paths>...
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r-- | Documentation/git-reset.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 4a4ceb6201..4f424782eb 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -7,7 +7,9 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- -'git-reset' [--mixed | --soft | --hard] [<commit-ish>] +[verse] +'git-reset' [--mixed | --soft | --hard] [<commit>] +'git-reset' [--mixed] <commit> [--] <paths>... DESCRIPTION ----------- @@ -21,6 +23,10 @@ the undo in the history. If you want to undo a commit other than the latest on a branch, gitlink:git-revert[1] is your friend. +The second form with 'paths' is used to revert selected paths in +the index from a given commit, without moving HEAD. + + OPTIONS ------- --mixed:: @@ -37,9 +43,9 @@ OPTIONS --hard:: Matches the working tree and index to that of the tree being switched to. Any changes to tracked files in the working tree - since <commit-ish> are lost. + since <commit> are lost. -<commit-ish>:: +<commit>:: Commit to make the current HEAD. Examples |