mirror of
https://github.com/git/git.git
synced 2024-11-29 04:54:56 +08:00
48bb914ed6
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.
21 lines
379 B
Plaintext
21 lines
379 B
Plaintext
git-merge-one-file(1)
|
|
=====================
|
|
|
|
NAME
|
|
----
|
|
git-merge-one-file - The standard helper program to use with git-merge-index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git merge-one-file'
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
This is the standard helper program to use with 'git merge-index'
|
|
to resolve a merge after the trivial merge done with 'git read-tree -m'.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|