summaryrefslogtreecommitdiffstats
path: root/git-diff-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-08-10 05:30:14 +0000
committerJunio C Hamano <junio@kernel.org>2010-08-10 05:30:14 +0000
commite85e36f153c88b736470872f5f9fab52799a28f6 (patch)
tree1218e005a39a1341cb78e3fc724a951dc30a15d3 /git-diff-index.html
parenta978876a665cbf17575e06e27f29c77326621c09 (diff)
downloadgit-htmldocs-e85e36f153c88b736470872f5f9fab52799a28f6.tar.gz
Autogenerated HTML docs for v1.7.2.1-66-g0d0ba
Diffstat (limited to 'git-diff-index.html')
-rw-r--r--git-diff-index.html35
1 files changed, 29 insertions, 6 deletions
diff --git a/git-diff-index.html b/git-diff-index.html
index 325942ca0..2aec8f7f3 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -654,27 +654,50 @@ override configuration settings.</p></div>
</p>
</dd>
<dt>
--B
+-B[&lt;n&gt;][/&lt;m&gt;]
</dt>
<dd>
<p>
- Break complete rewrite changes into pairs of delete and create.
-</p>
+ Break complete rewrite changes into pairs of delete and
+ create. This serves two purposes:
+</p>
+<div class="para"><p>It affects the way a change that amounts to a total rewrite of a file
+not as a series of deletion and insertion mixed together with a very
+few lines that happen to match textually as the context, but as a
+single deletion of everything old followed by a single insertion of
+everything new, and the number <tt>m</tt> controls this aspect of the -B
+option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
+original should remain in the result for git to consider it a total
+rewrite (i.e. otherwise the resulting patch will be a series of
+deletion and insertion mixed together with context lines).</p></div>
+<div class="para"><p>When used with -M, a totally-rewritten file is also considered as the
+source of a rename (usually -M only considers a file that disappeared
+as the source of a rename), and the number <tt>n</tt> controls this aspect of
+the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
+addition and deletion compared to 20% or more of the file's size are
+eligible for being picked up as a possible source of a rename to
+another file.</p></div>
</dd>
<dt>
--M
+-M[&lt;n&gt;]
</dt>
<dd>
<p>
Detect renames.
+ If <tt>n</tt> is specified, it is a is a threshold on the similarity
+ index (i.e. amount of addition/deletions compared to the
+ file's size). For example, <tt>-M90%</tt> means git should consider a
+ delete/add pair to be a rename if more than 90% of the file
+ hasn't changed.
</p>
</dd>
<dt>
--C
+-C[&lt;n&gt;]
</dt>
<dd>
<p>
Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
+ If <tt>n</tt> is specified, it has the same meaning as for <tt>-M&lt;n&gt;</tt>.
</p>
</dd>
<dt>
@@ -1582,7 +1605,7 @@ always have the special all-zero sha1.</td>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-07-21 21:55:20 UTC
+Last updated 2010-08-10 05:29:39 UTC
</div>
</div>
</body>