summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-03-11 00:52:08 -0500
committerLibravatar Jeff King <peff@peff.net>2011-03-11 10:59:16 -0500
commit48bb914ed641fc0880d86b16cbb17c84769c320a (patch)
tree6ec931fc258f0bd46e3438af9c72f3c2ada67e14 /Documentation/git-merge-file.txt
parentMerge branch 'maint' (diff)
downloadtgif-48bb914ed641fc0880d86b16cbb17c84769c320a.tar.xz
doc: drop author/documentation sections from most pages
The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage.
Diffstat (limited to 'Documentation/git-merge-file.txt')
-rw-r--r--Documentation/git-merge-file.txt11
1 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index f334d694e0..635c66956e 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -86,17 +86,6 @@ git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345::
merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
`a` and `c` instead of `tmp/a123` and `tmp/c345`.
-
-Author
-------
-Written by Johannes Schindelin <johannes.schindelin@gmx.de>
-
-
-Documentation
---------------
-Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
-with parts copied from the original documentation of RCS 'merge'.
-
GIT
---
Part of the linkgit:git[1] suite