diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
| commit | b1acf0200aa1efd66d18ed4e108792e1068464a9 (patch) | |
| tree | cbe03352fd89f04dad76fcd2c16544999ae21cbf /git-rebase.html | |
| parent | cf77b0414a44eadfcd0c74dfcae739427b7d2cce (diff) | |
| download | git-htmldocs-b1acf0200aa1efd66d18ed4e108792e1068464a9.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-227-g53f347
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 5a5f62709..be4e4d701 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1175,6 +1175,22 @@ the reversion" (see the <a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for details).</p></div>
</dd>
<dt class="hdlist1">
+--fork-point
+</dt>
+<dt class="hdlist1">
+--no-fork-point
+</dt>
+<dd>
+<p>
+ Use <em>git merge-base --fork-point</em> to find a better common ancestor
+ between <code>upstream</code> and <code>branch</code> when calculating which commits have
+ have been introduced by <code>branch</code> (see <a href="git-merge-base.html">git-merge-base(1)</a>).
+</p>
+<div class="paragraph"><p>If no non-option arguments are given on the command line, then the default is
+<code>--fork-point @{u}</code> otherwise the <code>upstream</code> argument is interpreted literally
+unless the <code>--fork-point</code> option is specified.</p></div>
+</dd>
+<dt class="hdlist1">
--ignore-whitespace
</dt>
<dt class="hdlist1">
@@ -1941,7 +1957,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2013-12-27 16:32:55 PST
</div>
</div>
</body>
|