Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index cc8f424bb7025a9a52f96fd9c92f6a5f8df569fa..e2e6aba17e7bde2bacb7f29ec4c54e5f9587dac6 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -317,15 +317,6 @@ linkgit:git-diff[1], linkgit:git-ls-files[1],
 linkgit:git-add[1], linkgit:git-rm[1],
 linkgit:git-mergetool[1]
 
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite