diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-05-14 22:26:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-05-14 22:26:07 +0000 |
| commit | 2fbcd210effb63ce172dc7002701b015a4a0f5a2 (patch) | |
| tree | adacb09d4b3a66cf5e57892ed0697cbe6fe705b2 /git-merge.html | |
| parent | 58276ec2a70778d0e75fcd45a2a50ad531bd1317 (diff) | |
| download | git-htmldocs-2fbcd210effb63ce172dc7002701b015a4a0f5a2.tar.gz | |
Autogenerated HTML docs for v1.5.5.1-248-g4b17
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index e166586d5..02a154c00 100644 --- a/git-merge.html +++ b/git-merge.html @@ -523,6 +523,16 @@ merge.log </p>
</dd>
<dt>
+merge.renameLimit
+</dt>
+<dd>
+<p>
+ The number of files to consider when performing rename detection
+ during a merge; if not specified, defaults to the value of
+ diff.renameLimit.
+</p>
+</dd>
+<dt>
merge.tool
</dt>
<dd>
@@ -739,7 +749,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 09-May-2008 05:45:38 UTC
+Last updated 14-May-2008 22:24:42 UTC
</div>
</div>
</body>
|