summaryrefslogtreecommitdiffstats
path: root/git-annotate.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-03-03 08:28:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-03-03 08:28:48 +0000
commit7924d5e05c8bd50ab7c2f8f1f41a8c5ec7c1edb8 (patch)
treefe7fe3ce02185509579e73bfb99e95d54f3870da /git-annotate.html
parentf8a792291dcb2d2897c8060f4eed60e1db74375a (diff)
downloadgit-htmldocs-7924d5e05c8bd50ab7c2f8f1f41a8c5ec7c1edb8.tar.gz
Autogenerated HTML docs for v1.6.2-rc2-22-g1d035
Diffstat (limited to 'git-annotate.html')
-rw-r--r--git-annotate.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-annotate.html b/git-annotate.html
index 59120e047..ac1b9d22b 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -314,7 +314,7 @@ git-annotate(1) Manual Page
<h2>NAME</h2>
<div class="sectionbody">
<p>git-annotate -
- Annotate file lines with commit info
+ Annotate file lines with commit information
</p>
</div>
</div>
@@ -325,10 +325,10 @@ git-annotate(1) Manual Page
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="para"><p>Annotates each line in the given file with information from the commit
-which introduced the line. Optionally annotate from a given revision.</p></div>
+which introduced the line. Optionally annotates from a given revision.</p></div>
<div class="para"><p>The only difference between this command and <a href="git-blame.html">git-blame(1)</a> is that
they use slightly different output formats, and this command exists only
-for backward compatibility to support existing scripts, and provide more
+for backward compatibility to support existing scripts, and provide a more
familiar command name for people coming from other SCM systems.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
@@ -481,7 +481,7 @@ of lines before or after the line given by &lt;start&gt;.</p></div>
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), traditional <em>blame</em> algorithm typically blames
+ 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
@@ -501,8 +501,8 @@ commit.</p></div>
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,
- the command looks for copies from all other files in the
- parent for the commit that creates the file in addition.
+ the command additionally looks for copies from all other
+ files in the parent for the commit that creates the file.
</p>
<div class="para"><p>&lt;num&gt; is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
@@ -536,7 +536,7 @@ commit.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-20 08:32:54 UTC
+Last updated 2009-03-03 08:28:31 UTC
</div>
</div>
</body>