summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Andrew Ruder <andy@aeruder.net>2007-04-18 22:03:26 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-18 22:07:57 -0700
commit6b04600a34a89241e7b1eb344667c8146a5dc99e (patch)
tree80d812186c6a050ee76218f0f4ede9648aa87615 /Documentation
parentUpdate git-archive documentation (diff)
downloadtgif-6b04600a34a89241e7b1eb344667c8146a5dc99e.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cherry-pick.txt2
1 files changed, 1 insertions, 1 deletions
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.