Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index df2a7c164130743b28f110bda3d323e978897bce..26cfb6219591e982a360f3303889bd594e5d3293 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