Merge branch 'maint'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4ce4f8d1c6efd18088c046a682ef66d6ae067bdc..52bc05ad50e8c64734c0f5a33c5bbc551128e955 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -252,7 +252,7 @@ gitlink:git-annotate[1]::
        Annotate file lines with commit info.
 
 gitlink:git-blame[1]::
-       Blame file lines on commits.
+       Find out where each line in a file came from.
 
 gitlink:git-check-ref-format[1]::
        Make sure ref name is well formed.