Documentation: minor grammatical fixes.
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
07f5746fb5
commit
a7d64b52da
@ -74,7 +74,7 @@ of lines before or after the line given by <start>.
|
|||||||
Detect moving lines in the file as well. When a commit
|
Detect moving lines in the file as well. When a commit
|
||||||
moves a block of lines in a file (e.g. the original file
|
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
|
has A and then B, and the commit changes it to B and
|
||||||
then A), traditional 'blame' algorithm typically blames
|
then A), the traditional 'blame' algorithm typically blames
|
||||||
the lines that were moved up (i.e. B) to the parent and
|
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)
|
assigns blame to the lines that were moved down (i.e. A)
|
||||||
to the child commit. With this option, both groups of lines
|
to the child commit. With this option, both groups of lines
|
||||||
@ -90,8 +90,8 @@ commit.
|
|||||||
files that were modified in the same commit. This is
|
files that were modified in the same commit. This is
|
||||||
useful when you reorganize your program and move code
|
useful when you reorganize your program and move code
|
||||||
around across files. When this option is given twice,
|
around across files. When this option is given twice,
|
||||||
the command looks for copies from all other files in the
|
the command additionally looks for copies from all other
|
||||||
parent for the commit that creates the file in addition.
|
files in the parent for the commit that creates the file.
|
||||||
+
|
+
|
||||||
<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
|
||||||
|
@ -3,7 +3,7 @@ git-annotate(1)
|
|||||||
|
|
||||||
NAME
|
NAME
|
||||||
----
|
----
|
||||||
git-annotate - Annotate file lines with commit info
|
git-annotate - Annotate file lines with commit information
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
@ -12,11 +12,11 @@ SYNOPSIS
|
|||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
Annotates each line in the given file with information from the commit
|
Annotates each line in the given file with information from the commit
|
||||||
which introduced the line. Optionally annotate from a given revision.
|
which introduced the line. Optionally annotates from a given revision.
|
||||||
|
|
||||||
The only difference between this command and linkgit:git-blame[1] is that
|
The only difference between this command and linkgit:git-blame[1] is that
|
||||||
they use slightly different output formats, and this command exists only
|
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.
|
familiar command name for people coming from other SCM systems.
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
|
Loading…
Reference in New Issue
Block a user