Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Document git-reset <commit> -- <paths>...
author
Junio C Hamano
<junkio@cox.net>
Tue, 26 Dec 2006 08:21:01 +0000
(
00:21
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 26 Dec 2006 08:21:01 +0000
(
00:21
-0800)
Documentation/git-reset.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
2f89543
)
diff --git
a/Documentation/git-reset.txt
b/Documentation/git-reset.txt
index 4a4ceb62012d7dbd56085a87d62aa4dec928d800..4f424782ebbd90572793a86bce862f3b856f56e0 100644
(file)
--- a/
Documentation/git-reset.txt
+++ b/
Documentation/git-reset.txt
@@
-7,7
+7,9
@@
git-reset - Reset current HEAD to the specified state
SYNOPSIS
--------
SYNOPSIS
--------
-'git-reset' [--mixed | --soft | --hard] [<commit-ish>]
+[verse]
+'git-reset' [--mixed | --soft | --hard] [<commit>]
+'git-reset' [--mixed] <commit> [--] <paths>...
DESCRIPTION
-----------
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.
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::
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
--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
Commit to make the current HEAD.
Examples