From: Junio C Hamano Date: Tue, 26 Dec 2006 08:21:01 +0000 (-0800) Subject: Document git-reset -- ... X-Git-Tag: v1.5.0-rc1~194 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6934dec89538e054823aadcce08af040bc8dcf79;p=git.git Document git-reset -- ... --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 4a4ceb620..4f424782e 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] [] +[verse] +'git-reset' [--mixed | --soft | --hard] [] +'git-reset' [--mixed] [--] ... 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 are lost. + since are lost. -:: +:: Commit to make the current HEAD. Examples