Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-17 03:23:51 +0400
committerJunio C Hamano <gitster@pobox.com>2010-06-17 03:23:51 +0400
commit3b3b9a6152a9458718119aa27db52248bf8df911 (patch)
treebefcd4002e8e980a8914f0b771d03f79a2576633 /Documentation
parent91788cf26e86c5bfb54431e7af34783d4c71dda0 (diff)
parent509de65f3b033838357b82d8ebc0ed73445a4fc5 (diff)
Merge branch 'by/blame-doc-m-c' into maint
* by/blame-doc-m-c: blame-options.txt: Add default value for `-M/-C` options.
Diffstat (limited to 'Documentation')
-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 d8205691c6..16e3c68576 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::