summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:24 (GMT)
commit770c54170a43ffb3810088a85f25c59c0cbf7b38 (patch)
tree435f3ac51f99459748d54a895326d6ec84c77ccc
parent82c531b3b6d24040443ba739e150bc06ecc762ea (diff)
parent509de65f3b033838357b82d8ebc0ed73445a4fc5 (diff)
downloadgit-770c54170a43ffb3810088a85f25c59c0cbf7b38.zip
git-770c54170a43ffb3810088a85f25c59c0cbf7b38.tar.gz
git-770c54170a43ffb3810088a85f25c59c0cbf7b38.tar.bz2
Merge branch 'by/blame-doc-m-c'
* by/blame-doc-m-c: blame-options.txt: Add default value for `-M/-C` options.
-rw-r--r--Documentation/blame-options.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index d820569..16e3c68 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -90,9 +90,9 @@ of lines before or after the line given by <start>.
running extra passes of inspection.
+
<num> is optional but it is the lower bound on the number of
-alphanumeric characters that git must detect as moving
+alphanumeric characters that git must detect as moving/copying
within a file for it to associate those lines with the parent
-commit.
+commit. The default value is 20.
-C|<num>|::
In addition to `-M`, detect lines moved or copied from other
@@ -105,9 +105,11 @@ commit.
looks for copies from other files in any commit.
+
<num> is optional but it is the lower bound on the number of
-alphanumeric characters that git must detect as moving
+alphanumeric characters that git must detect as moving/copying
between files for it to associate those lines with the parent
-commit.
+commit. And the default value is 40. If there are more than one
+`-C` options given, the <num> argument of the last `-C` will
+take effect.
-h::
--help::