summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 12:49:37 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-19 12:49:37 -0700
commita42e033b20a199fda9e2d77917e9a32105d98bb8 (patch)
tree39604095440c01f69e9d670a241e120d89aff90d /git-cherry-pick.html
parent0906e98c10b77ca498915c1d3206c1aa5aba0971 (diff)
downloadgit-htmldocs-a42e033b20a199fda9e2d77917e9a32105d98bb8.tar.gz
Autogenerated HTML docs for v2.22.0-545-g9c9b96
Diffstat (limited to 'git-cherry-pick.html')
-rw-r--r--git-cherry-pick.html15
1 files changed, 11 insertions, 4 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 19af61a9c..3d6f824d7 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -751,9 +751,7 @@ git-cherry-pick(1) Manual Page
<div class="verseblock">
<pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-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>
+<em>git cherry-pick</em> (--continue | --skip | --abort | --quit)</pre>
<div class="attribution">
</div></div>
</div>
@@ -1037,6 +1035,15 @@ effect to your index in a row.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--skip
+</dt>
+<dd>
+<p>
+ Skip the current commit and continue with the rest of the
+ sequence.
+</p>
+</dd>
+<dt class="hdlist1">
--quit
</dt>
<dd>
@@ -1200,7 +1207,7 @@ try to apply the change introduced by <code>topic^</code> again,
<div id="footer">
<div id="footer-text">
Last updated
- 2019-05-08 10:15:17 PDT
+ 2019-07-19 12:46:47 PDT
</div>
</div>
</body>