summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-08 23:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 23:50:14 (GMT)
commitd9722174573fc657c9b6c4adde6165d65c4e8de6 (patch)
tree48d47277faaa2a053ff51fac3d2ea3faa1c43bcc
parent56e5e9170e597f8ccba771cf2a7aa5de86e74799 (diff)
downloadgit-d9722174573fc657c9b6c4adde6165d65c4e8de6.zip
git-d9722174573fc657c9b6c4adde6165d65c4e8de6.tar.gz
git-d9722174573fc657c9b6c4adde6165d65c4e8de6.tar.bz2
Documentation/git-cherry-pick: Add --replay and --no-commit.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-cherry-pick.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index a7a883b..744f2c9 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -24,7 +24,7 @@ OPTIONS
With this option, `git-cherry-pick` will let you edit the commit
message prior committing.
--r::
+-r|--replay::
Usually the command appends which commit was
cherry-picked after the original commit message when
making a commit. This option, '--replay', causes it to
@@ -32,7 +32,7 @@ OPTIONS
when you are reordering the patches in your private tree
before publishing.
--n::
+-n|--no-commit::
Usually the command automatically creates a commit with
a commit log message stating which commit was
cherry-picked. This flag applies the change necessary