diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-10-27 06:08:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-10-27 06:08:54 +0000 |
| commit | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (patch) | |
| tree | 8e17591489f2ead0bcdc818641c8ded32625ec4e /git-rebase.html | |
| parent | d2179ef025405832dff42141faed13199886b61c (diff) | |
| download | git-htmldocs-39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-145-g7ebe
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 60 |
1 files changed, 59 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 8e7a1bc72..526d8e5a5 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -860,6 +860,55 @@ theirs </p>
</dd>
<dt>
+patience
+</dt>
+<dd>
+<p>
+ With this option, <em>merge-recursive</em> spends a little extra time
+ to avoid mismerges that sometimes occur due to unimportant
+ matching lines (e.g., braces from distinct functions). Use
+ this when the branches to be merged have diverged wildly.
+ See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
+</p>
+</dd>
+<dt>
+ignore-space-change
+</dt>
+<dt>
+ignore-all-space
+</dt>
+<dt>
+ignore-space-at-eol
+</dt>
+<dd>
+<p>
+ Treats lines with the indicated type of whitespace change as
+ unchanged for the sake of a three-way merge. Whitespace
+ changes mixed with other changes to a line are not ignored.
+ See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
+ <tt>--ignore-space-at-eol</tt>.
+</p>
+<div class="ilist"><ul>
+<li>
+<p>
+If <em>their</em> version only introduces whitespace changes to a line,
+ <em>our</em> version is used;
+</p>
+</li>
+<li>
+<p>
+If <em>our</em> version introduces whitespace changes but <em>their</em>
+ version includes a substantial change, <em>their</em> version is used;
+</p>
+</li>
+<li>
+<p>
+Otherwise, the merge proceeds in the usual way.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt>
renormalize
</dt>
<dd>
@@ -882,6 +931,15 @@ no-renormalize </p>
</dd>
<dt>
+rename-threshold=<n>
+</dt>
+<dd>
+<p>
+ Controls the similarity threshold used for rename detection.
+ See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
+</p>
+</dd>
+<dt>
subtree[=<path>]
</dt>
<dd>
@@ -1323,7 +1381,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-22 04:11:09 UTC
+Last updated 2010-10-27 06:08:21 UTC
</div>
</div>
</body>
|