Merge branch 'maint'

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 115b8bee0d762cefd4cd91c297830584cbc34a68..bec9accc8915c712bdea5e8975598e4f26db633f 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -165,6 +165,13 @@ environment). This command has the same behaviour.
 +
 Any other arguments are passed directly to `git log'
 
+'blame'::
+       Show what revision and author last modified each line of a file. This is
+       identical to `git blame', but SVN revision numbers are shown instead of git
+       commit hashes.
++
+All arguments are passed directly to `git blame'.
+
 --
 'find-rev'::
        When given an SVN revision number of the form 'rN', returns the