Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation cherry-pick: Fix cut-and-paste error
author
Mike Ralphson
<mike@abacus.co.uk>
Fri, 29 Feb 2008 17:00:38 +0000
(17:00 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 1 Mar 2008 05:22:22 +0000
(21:22 -0800)
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cherry-pick.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a1eebfb
)
diff --git
a/Documentation/git-cherry-pick.txt
b/Documentation/git-cherry-pick.txt
index 877ab66ef5c032af09ace5597bac64fd7739f468..f0beb412e655f0e188b8a1427b41f72b6cc61239 100644
(file)
--- a/
Documentation/git-cherry-pick.txt
+++ b/
Documentation/git-cherry-pick.txt
@@
-45,7
+45,7
@@
OPTIONS
default is not to do `-x` so this option is a no-op.
-m parent-number|--mainline parent-number::
- Usually you cannot
revert
a merge because you do not know which
+ Usually you cannot
cherry-pick
a merge because you do not know which
side of the merge should be considered the mainline. This
option specifies the parent number (starting from 1) of
the mainline and allows cherry-pick to replay the change