Merge branch 'maint'

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 791d4d4871b6a285878f8c43b3b0a76c7f63f57c..132505eb4f83fdc64778df8cf58b595ca6eadf1f 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -204,16 +204,6 @@ git grep --all-match -e NODE -e Unexpected::
        Looks for a line that has `NODE` or `Unexpected` in
        files that have lines that match both.
 
-Author
-------
-Originally written by Linus Torvalds <torvalds@osdl.org>, later
-revamped by Junio C Hamano.
-
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite