summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid J. Mellor <dmellor@whistlingcat.com>2009-03-02 06:38:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-02 20:34:54 (GMT)
commita7d64b52da7a843a1113f7e9cc624b4dee0e5f40 (patch)
treea51db43479acfd1933054953ac0e272d1116a7e8 /Documentation
parent07f5746fb580203f0d38a7828190a51a0c32d884 (diff)
downloadgit-a7d64b52da7a843a1113f7e9cc624b4dee0e5f40.zip
git-a7d64b52da7a843a1113f7e9cc624b4dee0e5f40.tar.gz
git-a7d64b52da7a843a1113f7e9cc624b4dee0e5f40.tar.bz2
Documentation: minor grammatical fixes.
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/blame-options.txt6
-rw-r--r--Documentation/git-annotate.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 7f28432..df2a7c1 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -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
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 '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
assigns blame to the lines that were moved down (i.e. A)
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
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.
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 0aba022..0590eec 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -3,7 +3,7 @@ git-annotate(1)
NAME
----
-git-annotate - Annotate file lines with commit info
+git-annotate - Annotate file lines with commit information
SYNOPSIS
--------
@@ -12,11 +12,11 @@ SYNOPSIS
DESCRIPTION
-----------
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
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.
OPTIONS