diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-04-12 15:45:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-04-12 15:45:55 +0000 |
| commit | 0e8c0b027943f592a2cc9d3752b32aba046a9f19 (patch) | |
| tree | 97976efdcee9f6e655e349cf31e50d26f17c0f23 /git-annotate.html | |
| parent | 9587de99358a1debfc8b67662206da15e5472cd5 (diff) | |
| download | git-htmldocs-0e8c0b027943f592a2cc9d3752b32aba046a9f19.tar.gz | |
Autogenerated HTML docs for v1.7.1-rc1-9-g4553d
Diffstat (limited to 'git-annotate.html')
| -rw-r--r-- | git-annotate.html | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/git-annotate.html b/git-annotate.html index cf6c28357..680b8499a 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -491,14 +491,15 @@ of lines before or after the line given by <start>.</p></div> </dt>
<dd>
<p>
- 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 <em>blame</em> 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 <em>blame</em> 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.
</p>
<div class="para"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
@@ -510,7 +511,7 @@ commit.</p></div> </dt>
<dd>
<p>
- In addition to <tt>-M</tt>, detect lines copied from other
+ In addition to <tt>-M</tt>, 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,
@@ -551,7 +552,7 @@ commit.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-02-13 00:59:34 UTC
+Last updated 2010-04-12 15:45:39 UTC
</div>
</div>
</body>
|