summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
commit5b3533dc1d20a4946b19e379650c2faa5b88c9ec (patch)
tree3bc7b2357c9f22023f51c443d7d07fa87aa8fbf3 /git-cherry-pick.txt
parent616a76d3a7e606b4673a9657b203c03a152e7a63 (diff)
downloadgit-htmldocs-5b3533dc1d20a4946b19e379650c2faa5b88c9ec.tar.gz
Autogenerated HTML docs for v1.9.0-138-g2de34
Diffstat (limited to 'git-cherry-pick.txt')
-rw-r--r--git-cherry-pick.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index c205d2363..f1e6b2fd6 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -8,7 +8,8 @@ git-cherry-pick - Apply the changes introduced by some existing commits
SYNOPSIS
--------
[verse]
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+ [-S[<keyid>]] <commit>...
'git cherry-pick' --continue
'git cherry-pick' --quit
'git cherry-pick' --abort
@@ -100,6 +101,10 @@ effect to your index in a row.
--signoff::
Add Signed-off-by line at the end of the commit message.
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign commits.
+
--ff::
If the current HEAD is the same as the parent of the
cherry-pick'ed commit, then a fast forward to this commit will