summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-11 16:49:45 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-11 16:49:45 -0800
commita9572072f0ab0ac97e64b0dc01254a3ad95befe1 (patch)
tree2375e3b4aea11444375f9f587c8ca4cd8d22d6d0 /Documentation/git-cherry-pick.txt
parent423325a2d24638ddcc82ce47be5e40be550f4507 (diff)
parentb825e6ff5d003db8efd1ed43cdbbb9d637df0a0c (diff)
downloadgit-0.99.9m.tar.xz
GIT 0.99.9m aka 1.0rc5v1.0rc5v0.99.9m
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
-rw-r--r--Documentation/git-cherry-pick.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 26e0467797..4f323fa42a 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit.
SYNOPSIS
--------
-'git-cherry-pick' [-n] [-r] <commit>
+'git-cherry-pick' [--edit] [-n] [-r] <commit>
DESCRIPTION
-----------
@@ -20,15 +20,19 @@ OPTIONS
<commit>::
Commit to cherry-pick.
--r::
+-e|--edit::
+ With this option, `git-cherry-pick` will let you edit the commit
+ message prior committing.
+
+-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
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::
+-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