Merge branch 'mm/maint-log-n-with-diff-filtering'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index c43aa438c7ee3a937036df805aba0cdf5a9e60dd..2c84028838d566d424082efc71516f565b0ebbd2 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -182,14 +182,6 @@ This setting can be disabled by the `--no-standard-notes` option,
 overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
 and supplemented by the `--show-notes` option.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite