aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-04 16:38:40 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-04 16:38:40 -0800
commitf83df6d66e08f1f68b2c1c6aa2ba8b626990df5f (patch)
tree30a122488f9c9e1edc258b8c82bdc20e36685294 /Documentation/git-cherry-pick.txt
parent8bf14d6ef9245f3b81d24cb7725a868f62343277 (diff)
downloadgit-f83df6d66e08f1f68b2c1c6aa2ba8b626990df5f.tar.gz
git-f83df6d66e08f1f68b2c1c6aa2ba8b626990df5f.tar.xz
Documentation: rebase does not use cherry-pick anymore.
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 5e0ef5ae0..a7a883b83 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -30,7 +30,7 @@ OPTIONS
making a commit. This option, '--replay', causes it to
use the original commit message intact. This is useful
when you are reordering the patches in your private tree
- before publishing, and is used by 'git rebase'.
+ before publishing.
-n::
Usually the command automatically creates a commit with