Merge branch 'db/vcs-svn-incremental' into svn-fe

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 484fdd5be7901a45d94dd4362c91339ed0753995..52db1d80cfe068f39ae5996a88e95bbfcf095a36 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -205,11 +205,6 @@ would conflict the same way as the test merge you resolved earlier.
 'git rerere' will be run by 'git rebase' to help you resolve this
 conflict.
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
 GIT
 ---
 Part of the linkgit:git[1] suite