summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
commit1eb5609b6b3e2908ee747dfe313c24f17334ce26 (patch)
tree7399ab13ecb59275ff9caa0624441831a5b0f8de /git-cherry-pick.html
parent70d664063d4eb347c0d30071e08a40fbf72dcd34 (diff)
downloadgit-htmldocs-1eb5609b6b3e2908ee747dfe313c24f17334ce26.tar.gz
Autogenerated HTML docs for v2.6.1-120-g24a00e
Diffstat (limited to 'git-cherry-pick.html')
-rw-r--r--git-cherry-pick.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 3b40c3040..2a4b0e407 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -749,7 +749,7 @@ git-cherry-pick(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
- [-S[&lt;key-id&gt;]] &lt;commit&gt;&#8230;
+ [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;
<em>git cherry-pick</em> --continue
<em>git cherry-pick</em> --quit
<em>git cherry-pick</em> --abort</pre>
@@ -909,14 +909,16 @@ effect to your index in a row.</p></div>
</p>
</dd>
<dt class="hdlist1">
--S[&lt;key-id&gt;]
+-S[&lt;keyid&gt;]
</dt>
<dt class="hdlist1">
---gpg-sign[=&lt;key-id&gt;]
+--gpg-sign[=&lt;keyid&gt;]
</dt>
<dd>
<p>
- GPG-sign commits.
+ GPG-sign commits. The <code>keyid</code> argument is optional and
+ defaults to the committer identity; if specified, it must be
+ stuck to the option without a space.
</p>
</dd>
<dt class="hdlist1">
@@ -1171,7 +1173,7 @@ context lines.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-04-14 14:41:37 PDT
+Last updated 2015-10-05 13:38:43 PDT
</div>
</div>
</body>