Merge branch 'maint'

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 63fc197fbe768e39fde653a24f77e6d8f03af114..4833cac4b996e83e351b70d8f02a160d04e9a8e3 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
        Show raw timestamp (Default: off).
 
 -S <revs-file>::
-       Use revs from revs-file instead of calling linkgit:git-rev-list[1].
+       Use revisions from revs-file instead of calling linkgit:git-rev-list[1].
 
 --reverse::
        Walk history forward instead of backward. Instead of showing
@@ -98,8 +98,10 @@ 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 additionally looks for copies from all other
-       files in the parent for the commit that creates the file.
+       the command additionally looks for copies from other
+       files in the commit that creates the file. When this
+       option is given three times, the command additionally
+       looks for copies from other files in any commit.
 +
 <num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving