Merge branch 'by/blame-doc-m-c'

* by/blame-doc-m-c:
  blame-options.txt: Add default value for `-M/-C` options.
This commit is contained in:
Junio C Hamano 2010-05-21 04:02:24 -07:00
commit 770c54170a

View File

@ -90,9 +90,9 @@ of lines before or after the line given by <start>.
running extra passes of inspection. running extra passes of inspection.
+ +
<num> is optional but it is the lower bound on the number of <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 within a file for it to associate those lines with the parent
commit. commit. The default value is 20.
-C|<num>|:: -C|<num>|::
In addition to `-M`, detect lines moved or copied from other 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. looks for copies from other files in any commit.
+ +
<num> is optional but it is the lower bound on the number of <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 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:: -h::
--help:: --help::