From: Andrew Ruder <andy@aeruder.net>
Date: Thu, 19 Apr 2007 03:03:26 +0000 (-0500)
Subject: Update git-cherry-pick documentation
X-Git-Tag: v1.5.1.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b04600a34a89241e7b1eb344667c8146a5dc99e;p=thirdparty%2Fgit.git

Update git-cherry-pick documentation

Documentation/git-cherry-pick.txt: Remove --replay as it is not
handled by the code (-r is however).

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 3149d08da8..68bba98260 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -38,7 +38,7 @@ OPTIONS
 	development branch), adding this information can be
 	useful.
 
--r|--replay::
+-r::
 	It used to be that the command defaulted to do `-x`
 	described above, and `-r` was to disable it.  Now the
 	default is not to do `-x` so this option is a no-op.