summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorAndrew Ruder <andy@aeruder.net>2007-04-19 03:03:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-19 05:07:57 (GMT)
commit6b04600a34a89241e7b1eb344667c8146a5dc99e (patch)
tree80d812186c6a050ee76218f0f4ede9648aa87615 /Documentation/git-cherry-pick.txt
parent27c8f8cda42b9e47dc18e94152b28472488bef1c (diff)
downloadgit-6b04600a34a89241e7b1eb344667c8146a5dc99e.zip
git-6b04600a34a89241e7b1eb344667c8146a5dc99e.tar.gz
git-6b04600a34a89241e7b1eb344667c8146a5dc99e.tar.bz2
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/git-cherry-pick.txt')
-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 3149d08..68bba98 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.