summaryrefslogtreecommitdiffstats
path: root/git-p4.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-15 22:28:39 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-15 22:28:39 -0700
commit0248269de7cca134098c35330c96a84a39eca214 (patch)
tree6a699c9f0efbe26f3f87b2a9f8b3d0e721b90f48 /git-p4.html
parentb61a777e41bce40f57f77443aca23664309e215d (diff)
downloadgit-htmldocs-0248269de7cca134098c35330c96a84a39eca214.tar.gz
Autogenerated HTML docs for v1.7.11.2-249-g31c79
Diffstat (limited to 'git-p4.html')
-rw-r--r--git-p4.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-p4.html b/git-p4.html
index 88782ec2f..76a463683 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -919,7 +919,7 @@ options described above.</p></div>
</p>
</dd>
<dt class="hdlist1">
--M[&lt;n&gt;]
+-M
</dt>
<dd>
<p>
@@ -1228,7 +1228,8 @@ git-p4.detectRenames
</dt>
<dd>
<p>
- Detect renames. See <a href="git-diff.html">git-diff(1)</a>.
+ Detect renames. See <a href="git-diff.html">git-diff(1)</a>. This can be true,
+ false, or a score as expected by <em>git diff -M</em>.
</p>
</dd>
<dt class="hdlist1">
@@ -1236,7 +1237,8 @@ git-p4.detectCopies
</dt>
<dd>
<p>
- Detect copies. See <a href="git-diff.html">git-diff(1)</a>.
+ Detect copies. See <a href="git-diff.html">git-diff(1)</a>. This can be true,
+ false, or a score as expected by <em>git diff -C</em>.
</p>
</dd>
<dt class="hdlist1">
@@ -1244,7 +1246,7 @@ git-p4.detectCopiesHarder
</dt>
<dd>
<p>
- Detect copies harder. See <a href="git-diff.html">git-diff(1)</a>.
+ Detect copies harder. See <a href="git-diff.html">git-diff(1)</a>. A boolean.
</p>
</dd>
<dt class="hdlist1">
@@ -1373,7 +1375,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-10 11:44:38 PDT
+Last updated 2012-07-15 22:27:35 PDT
</div>
</div>
</body>