Skip to content

Commit d8c416b

Browse files
committed
blame documentation: -M/-C notice copied lines as well as moved ones
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 54fd955 commit d8c416b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

Documentation/blame-options.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,23 @@ of lines before or after the line given by <start>.
7979
of the --date option at linkgit:git-log[1].
8080

8181
-M|<num>|::
82-
Detect moving lines in the file as well. When a commit
83-
moves a block of lines in a file (e.g. the original file
84-
has A and then B, and the commit changes it to B and
85-
then A), the traditional 'blame' algorithm typically blames
86-
the lines that were moved up (i.e. B) to the parent and
87-
assigns blame to the lines that were moved down (i.e. A)
88-
to the child commit. With this option, both groups of lines
89-
are blamed on the parent.
82+
Detect moved or copied lines within a file. When a commit
83+
moves or copies a block of lines (e.g. the original file
84+
has A and then B, and the commit changes it to B and then
85+
A), the traditional 'blame' algorithm notices only half of
86+
the movement and typically blames the lines that were moved
87+
up (i.e. B) to the parent and assigns blame to the lines that
88+
were moved down (i.e. A) to the child commit. With this
89+
option, both groups of lines are blamed on the parent by
90+
running extra passes of inspection.
9091
+
9192
<num> is optional but it is the lower bound on the number of
9293
alphanumeric characters that git must detect as moving
9394
within a file for it to associate those lines with the parent
9495
commit.
9596

9697
-C|<num>|::
97-
In addition to `-M`, detect lines copied from other
98+
In addition to `-M`, detect lines moved or copied from other
9899
files that were modified in the same commit. This is
99100
useful when you reorganize your program and move code
100101
around across files. When this option is given twice,

0 commit comments

Comments
 (0)