diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-11 23:17:42 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-11 23:17:42 +0400 |
commit | d8c416b2518a96e5d535b8e4b2349e7c647a4be5 (patch) | |
tree | 40946342097ab648d3b1b25f2d5ae2216202ab59 | |
parent | 54fd955c211db6f4a2c91301f792ec9de86eed31 (diff) |
blame documentation: -M/-C notice copied lines as well as moved ones
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/blame-options.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 4833cac4b9..d8205691c6 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -79,14 +79,15 @@ of lines before or after the line given by <start>. of the --date option at linkgit:git-log[1]. -M|<num>|:: - Detect moving lines in the file as well. When a commit - moves a block of lines in a file (e.g. the original file - has A and then B, and the commit changes it to B and - then A), the traditional 'blame' algorithm typically blames - the lines that were moved up (i.e. B) to the parent and - assigns blame to the lines that were moved down (i.e. A) - to the child commit. With this option, both groups of lines - are blamed on the parent. + Detect moved or copied lines within a file. When a commit + moves or copies a block of lines (e.g. the original file + has A and then B, and the commit changes it to B and then + A), the traditional 'blame' algorithm notices only half of + the movement and typically blames the lines that were moved + up (i.e. B) to the parent and assigns blame to the lines that + were moved down (i.e. A) to the child commit. With this + option, both groups of lines are blamed on the parent by + 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 @@ -94,7 +95,7 @@ within a file for it to associate those lines with the parent commit. -C|<num>|:: - In addition to `-M`, detect lines copied from other + In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, |