diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-11-04 11:13:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-11-04 11:13:49 +0000 |
| commit | d814b6de0197ec2c339a8d2de7f7d9a890c25b11 (patch) | |
| tree | 96569d2d7a31eb648a67c49eeb857f503bfb054a /git-cherry-pick.html | |
| parent | 7ae0ab27c80a24b52c6c1bbd3fb8325cb22eb2da (diff) | |
| download | git-htmldocs-d814b6de0197ec2c339a8d2de7f7d9a890c25b11.tar.gz | |
Autogenerated HTML docs for v1.5.3.5-561-g140d
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3e510498e..1aee1b041 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -272,7 +272,7 @@ git-cherry-pick(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-cherry-pick</em> [--edit] [-n] [-x] <commit></p>
+<p><em>git-cherry-pick</em> [--edit] [-n] [-m parent-number] [-x] <commit></p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -331,6 +331,18 @@ modifications from the HEAD commit).</p> </p>
</dd>
<dt>
+-m parent-number|--mainline parent-number
+</dt>
+<dd>
+<p>
+ Usually you cannot revert a merge because you do not know which
+ side of the merge should be considered the mainline. This
+ option specifies the parent number (starting from 1) of
+ the mainline and allows cherry-pick to replay the change
+ relative to the specified parent.
+</p>
+</dd>
+<dt>
-n|--no-commit
</dt>
<dd>
@@ -363,7 +375,7 @@ effect to your working tree in a row.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 23-Oct-2007 01:21:45 UTC
+Last updated 04-Nov-2007 11:13:00 UTC
</div>
</div>
</body>
|