1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-31 08:26:13 +02:00

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.
This commit is contained in:
Jeff King 2011-03-11 00:52:08 -05:00
parent adfe4e1ff2
commit 48bb914ed6
134 changed files with 4 additions and 1134 deletions

View File

@ -378,14 +378,6 @@ linkgit:git-mv[1]
linkgit:git-commit[1]
linkgit:git-update-index[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -189,15 +189,6 @@ SEE ALSO
--------
linkgit:git-apply[1].
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -27,10 +27,6 @@ SEE ALSO
--------
linkgit:git-blame[1]
AUTHOR
------
Written by Ryan Anderson <ryan@michonline.com>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -246,20 +246,10 @@ If `--index` is not specified, then the submodule commits in the patch
are ignored and only the absence or presence of the corresponding
subdirectory is checked and (if possible) updated.
SEE ALSO
--------
linkgit:git-am[1].
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano
GIT
---
Part of the linkgit:git[1] suite

View File

@ -107,14 +107,6 @@ OPTIONS
Archive/branch identifier in a format that `tla log` understands.
Author
------
Written by Martin Langhoff <martin@laptop.org>.
Documentation
--------------
Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -153,14 +153,6 @@ SEE ALSO
--------
linkgit:gitattributes[5]
Author
------
Written by Franck Bui-Huu and Rene Scharfe.
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -322,14 +322,6 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
+
Does the same as the previous example, but on a single line.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
-------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
SEE ALSO
--------
link:git-bisect-lk2009.html[Fighting regressions with git bisect],

View File

@ -198,10 +198,6 @@ SEE ALSO
--------
linkgit:git-annotate[1]
AUTHOR
------
Written by Junio C Hamano <gitster@pobox.com>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -232,14 +232,6 @@ linkgit:git-remote[1],
link:user-manual.html#what-is-a-branch[``Understanding history: What is
a branch?''] in the Git User's Manual.
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and 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

View File

@ -201,10 +201,6 @@ You can also see what references it offers:
$ git ls-remote mybundle
----------------
Author
------
Written by Mark Levedahl <mdl123@verizon.net>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -100,14 +100,6 @@ for each object specified on stdin that does not exist in the repository:
<object> SP missing LF
------------
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

View File

@ -86,15 +86,6 @@ SEE ALSO
--------
linkgit:gitattributes[5].
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by James Bowes.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -172,18 +172,6 @@ $ git checkout-index --prefix=.merged- Makefile
This will check out the currently cached copy of `Makefile`
into the file `.merged-Makefile`.
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

View File

@ -422,15 +422,6 @@ $ edit frotz
$ git add frotz
------------
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -171,14 +171,6 @@ the working tree.
spending extra time to avoid mistakes based on incorrectly matching
context lines.
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
SEE ALSO
--------
linkgit:git-revert[1]

View File

@ -63,14 +63,6 @@ SEE ALSO
--------
linkgit:git-patch-id[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

View File

@ -19,14 +19,6 @@ to the less interactive 'git commit' program.
'git citool' is actually a standard alias for `git gui citool`.
See linkgit:git-gui[1] for more details.
Author
------
Written by Shawn O. Pearce <spearce@spearce.org>.
Documentation
--------------
Documentation by Shawn O. Pearce <spearce@spearce.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -61,12 +61,6 @@ OPTIONS
Remove only files ignored by git. This may be useful to rebuild
everything from scratch, but keep manually created files.
Author
------
Written by Pavel Roskin <proski@gnu.org>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -236,17 +236,6 @@ $ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
/pub/scm/.../me/subsys-2.6.git
------------
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -93,15 +93,6 @@ SEE ALSO
--------
linkgit:git-write-tree[1]
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

View File

@ -397,12 +397,6 @@ linkgit:git-mv[1],
linkgit:git-merge[1],
linkgit:git-commit-tree[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
Junio C Hamano <gitster@pobox.com>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -336,15 +336,6 @@ echo "${WS}your whitespace color or blue reverse${RESET}"
include::config.txt[]
Author
------
Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>
Documentation
--------------
Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -25,15 +25,6 @@ OPTIONS
and number of objects that can be removed by running
`git prune-packed`.
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

View File

@ -112,14 +112,6 @@ $ cd ~/project_cvs_checkout
$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v
------------
Author
------
Written by Martin Langhoff <martin@laptop.org> and others.
Documentation
--------------
Documentation by Martin Langhoff <martin@laptop.org> and others.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -217,15 +217,6 @@ more stable in practice:
* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
Author
------
Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from
various participants of the git-list <git@vger.kernel.org>.
Documentation
--------------
Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -391,22 +391,6 @@ Dependencies
------------
'git-cvsserver' depends on DBD::SQLite.
Copyright and Authors
---------------------
This program is copyright The Open University UK - 2006.
Authors:
- Martyn Smith <martyn@catalyst.net.nz>
- Martin Langhoff <martin@laptop.org>
with ideas and patches from participants of the git-list <git@vger.kernel.org>.
Documentation
--------------
Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@laptop.org>, and Matthias Urlichs <smurf@smurf.noris.de>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -279,17 +279,6 @@ that connected to it, if the IP address is available. REMOTE_ADDR will
be available in the environment of hooks called when
services are performed.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
<yoshfuji@linux-ipv6.org> and the git-list <git@vger.kernel.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -156,17 +156,6 @@ selected and output. Here fewest commits different is defined as
the number of commits which would be shown by `git log tag..input`
will be the smallest number of commits possible.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>, but somewhat
butchered by Junio C Hamano <gitster@pobox.com>. Later significantly
updated by Shawn Pearce <spearce@spearce.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

View File

@ -46,15 +46,6 @@ omit diff output for unmerged entries and just show "Unmerged".
include::diff-format.txt[]
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

View File

@ -116,15 +116,6 @@ tell which file is in which state, since the "has been updated" ones
show a valid sha1, and the "not in sync with the index" ones will
always have the special all-zero sha1.
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

View File

@ -162,15 +162,6 @@ in case you care).
include::diff-format.txt[]
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

View File

@ -174,14 +174,6 @@ linkgit:gitdiffcore[7],
linkgit:git-format-patch[1],
linkgit:git-apply[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -109,15 +109,6 @@ linkgit:git-mergetool[1]::
linkgit:git-config[1]::
Get and set repository or global options
AUTHOR
------
Written by David Aguilar <davvid@gmail.com>.
Documentation
--------------
Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -135,15 +135,6 @@ Since 'git fast-import' cannot tag trees, you will not be
able to export the linux-2.6.git repository completely, as it contains
a tag referencing a tree instead of a commit.
Author
------
Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
Documentation
--------------
Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -1350,14 +1350,6 @@ operator can use this facility to peek at the objects and refs from an
import in progress, at the cost of some added running time and worse
compression.
Author
------
Written by Shawn O. Pearce <spearce@spearce.org>.
Documentation
--------------
Documentation by Shawn O. Pearce <spearce@spearce.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -90,15 +90,6 @@ OPTIONS
$GIT_DIR (e.g. "HEAD", "refs/heads/master"). When
unspecified, update from all heads the remote side has.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -80,16 +80,6 @@ SEE ALSO
--------
linkgit:git-pull[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
Junio C Hamano <gitster@pobox.com>
Documentation
-------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -405,16 +405,6 @@ warned.
(or if your git-gc is not new enough to support arguments to
`\--prune`, use `git repack -ad; git prune` instead).
Author
------
Written by Petr "Pasky" Baudis <pasky@suse.cz>,
and the git list <git@vger.kernel.org>
Documentation
--------------
Documentation by Petr Baudis and the git list.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -67,15 +67,6 @@ SEE ALSO
--------
linkgit:git-merge[1]
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -278,15 +278,6 @@ SEE ALSO
--------
linkgit:git-am[1], linkgit:git-send-email[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

View File

@ -140,14 +140,6 @@ GIT_INDEX_FILE::
GIT_ALTERNATE_OBJECT_DIRECTORIES::
used to specify additional object database roots (usually unset)
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

View File

@ -151,10 +151,6 @@ linkgit:git-reflog[1]
linkgit:git-repack[1]
linkgit:git-rerere[1]
Author
------
Written by Shawn O. Pearce <spearce@spearce.org>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -22,15 +22,6 @@ return code of 1. This can happen if <tarfile> had not been created
using 'git archive' or if the first parameter of 'git archive' had been
a tree ID instead of a commit ID or tag.
Author
------
Written by Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -203,16 +203,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

View File

@ -121,14 +121,6 @@ or
or browsed online at http://repo.or.cz/w/git-gui.git/[].
Author
------
Written by Shawn O. Pearce <spearce@spearce.org>.
Documentation
--------------
Documentation by Shawn O. Pearce <spearce@spearce.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -53,14 +53,6 @@ OPTIONS
conversion. If the file is read from standard input then this
is always implied, unless the --path option is given.
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -171,17 +171,6 @@ $ git config --global web.browser firefox
as they are probably more user specific than repository specific.
See linkgit:git-config[1] for more information about this.
Author
------
Written by Junio C Hamano <gitster@pobox.com> and the git-list
<git@vger.kernel.org>.
Documentation
-------------
Initial documentation was part of the linkgit:git[1] man page.
Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
little. Maintenance is done by the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -43,14 +43,6 @@ commit-id::
Verify that everything reachable from target is fetched. Used after
an earlier fetch is interrupted.
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

View File

@ -91,15 +91,6 @@ With '--force', the fast-forward check is disabled for all refs.
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
to disable the fast-forward check only on that ref.
Author
------
Written by Nick Hengeveld <nickh@reactrix.com>
Documentation
--------------
Documentation by Nick Hengeveld
GIT
---
Part of the linkgit:git[1] suite

View File

@ -124,14 +124,6 @@ Thunderbird in particular is known to be problematic. Thunderbird
users may wish to visit this web page for more information:
http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email
Author
------
Derived from isync 1.0.1 by Mike McCormack.
Documentation
--------------
Documentation by Mike McCormack
GIT
---
Part of the linkgit:git[1] suite

View File

@ -85,15 +85,6 @@ new .keep file was successfully created. This is useful to remove a
.keep file used as a lock to prevent the race with 'git repack'
mentioned above.
Author
------
Written by Sergey Vlasov <vsu@altlinux.ru>
Documentation
-------------
Documentation by Sergey Vlasov
GIT
---
Part of the linkgit:git[1] suite

View File

@ -134,15 +134,6 @@ $ git add . <2>
<1> prepare /path/to/my/codebase/.git directory
<2> add all existing file to the index
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

View File

@ -84,14 +84,6 @@ If the configuration variable 'instaweb.browser' is not set,
'web.browser' will be used instead if it is defined. See
linkgit:git-web{litdd}browse[1] for more information about this.
Author
------
Written by Eric Wong <normalperson@yhbt.net>
Documentation
--------------
Documentation by Eric Wong <normalperson@yhbt.net>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -181,14 +181,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

View File

@ -67,15 +67,6 @@ $ git rev-parse not-lost-anymore
1ef2b196d909eed523d4f3c9bf54b78cdd6843c6
------------
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

View File

@ -209,15 +209,6 @@ SEE ALSO
--------
linkgit:git-read-tree[1], linkgit:gitignore[5]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -67,10 +67,6 @@ EXAMPLES
c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
Author
------
Written by Junio C Hamano <gitster@pobox.com>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -95,18 +95,6 @@ Object size identified by <object> is given in bytes, and right-justified
with minimum width of 7 characters. Object size is given only for blobs
(file) entries; for other entries `-` character is used in place of size.
Author
------
Written by Petr Baudis <pasky@suse.cz>
Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>,
another major rewrite 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

View File

@ -80,17 +80,6 @@ This can enabled by default with the configuration option mailinfo.scissors.
<patch>::
The patch extracted from e-mail.
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
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

View File

@ -46,16 +46,6 @@ OPTIONS
--keep-cr::
Do not remove `\r` from lines ending with `\r\n`.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
and 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

View File

@ -102,14 +102,6 @@ both '1' and '2' are merge-bases of A and B. Neither one is better than
the other (both are 'best' merge bases). When the `--all` option is not given,
it is unspecified which best one is output.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
See also
--------
linkgit:git-rev-list[1],

View File

@ -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

View File

@ -73,15 +73,6 @@ merge once anything has returned an error (i.e., `cat` returned an error
for the AA file, because it didn't exist in the original, and thus
'git merge-index' didn't even try to merge the MM thing).
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
One-shot merge by Petr Baudis <pasky@ucw.cz>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -15,15 +15,6 @@ 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'.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>,
Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -23,14 +23,6 @@ merge results outside of the index, and stuff the results back into the
index. For this reason, the output from the command omits
entries that match the <branch1> tree.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -312,15 +312,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

View File

@ -41,14 +41,6 @@ run_merge_tool::
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
for use by the merge tool.
Author
------
Written by David Aguilar <davvid@gmail.com>
Documentation
--------------
Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -82,14 +82,6 @@ Setting the `mergetool.keepBackup` configuration variable to `false`
causes `git mergetool` to automatically remove the backup as files
are successfully merged.
Author
------
Written by Theodore Y Ts'o <tytso@mit.edu>
Documentation
--------------
Documentation by Theodore Y Ts'o.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -32,15 +32,6 @@ exists, is separated by a blank line from the header. The
message part may contain a signature that git itself doesn't
care about, but that can be verified with gpg.
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

View File

@ -34,14 +34,6 @@ OPTIONS
optional. Note - if the '-z' option is used, lines are terminated
with NUL.
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

View File

@ -39,17 +39,6 @@ OPTIONS
--dry-run::
Do nothing; only show what would happen
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Rewritten by Ryan Anderson <ryan@michonline.com>
Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -70,15 +70,6 @@ Another nice thing you can do is:
% git log | git name-rev --stdin
------------
Author
------
Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>
Documentation
--------------
Documentation by Johannes Schindelin.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -219,15 +219,6 @@ self-contained. Use `git index-pack --fix-thin`
With this option, parents that are hidden by grafts are packed
nevertheless.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
-------------
Documentation by Junio C Hamano
SEE ALSO
--------
linkgit:git-rev-list[1]

View File

@ -38,14 +38,6 @@ OPTIONS
--verbose::
Outputs some statistics to stderr. Has a small performance penalty.
Author
------
Written by Lukas Sandström <lukass@etek.chalmers.se>
Documentation
--------------
Documentation by Lukas Sandström <lukass@etek.chalmers.se>
SEE ALSO
--------
linkgit:git-pack-objects[1]

View File

@ -56,11 +56,6 @@ a repository with many branches of historical interests.
The command usually removes loose refs under `$GIT_DIR/refs`
hierarchy after packing them. This option tells it not to.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -17,14 +17,6 @@ routines to parse files under $GIT_DIR/remotes/ and
$GIT_DIR/branches/ and configuration variables that are related
to fetching, pulling and pushing.
Author
------
Written 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

View File

@ -29,14 +29,6 @@ OPTIONS
<patch>::
The diff to create the ID of.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -37,14 +37,6 @@ OPTIONS
The repository to sync from.
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Junio C Hamano.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -36,14 +36,6 @@ OPTIONS
--quiet::
Squelch the progress indicator.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Ryan Anderson <ryan@michonline.com>
SEE ALSO
--------
linkgit:git-pack-objects[1]

View File

@ -78,14 +78,6 @@ linkgit:git-fsck[1],
linkgit:git-gc[1],
linkgit:git-reflog[1]
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

View File

@ -224,18 +224,6 @@ SEE ALSO
--------
linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
and Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Jon Loeliger,
David Greaves,
Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -406,16 +406,6 @@ Commits A and B would no longer belong to a branch with a symbolic name,
and so would be unreachable. As such, these commits would be removed by
a `git gc` command on the origin repository.
Author
------
Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C
by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -49,14 +49,6 @@ The default for the patch directory is patches
or the value of the $QUILT_PATCHES environment
variable.
Author
------
Written by Eric Biederman <ebiederm@lnxi.com>
Documentation
--------------
Documentation by Eric Biederman <ebiederm@lnxi.com>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -421,15 +421,6 @@ SEE ALSO
linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
linkgit:gitignore[5]
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

View File

@ -658,7 +658,6 @@ The ripple effect of a "hard case" recovery is especially bad:
'everyone' downstream from 'topic' will now have to perform a "hard
case" recovery too!
BUGS
----
The todo list presented by `--preserve-merges --interactive` does not
@ -681,15 +680,6 @@ by moving the "pick 4" line will result in the following history:
1 --- 2 --- 4 --- 5
------------
Authors
------
Written by Junio C Hamano <gitster@pobox.com> and
Johannes E. Schindelin <johannes.schindelin@gmx.de>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -151,15 +151,6 @@ SEE ALSO
--------
linkgit:git-send-pack[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -90,14 +90,6 @@ them.
--verbose::
Print extra information on screen.
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

View File

@ -24,14 +24,6 @@ OPTIONS
<dir>::
Directories containing a .git/objects/ subdirectory.
Author
------
Written by Ryan Anderson <ryan@michonline.com>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -239,10 +239,6 @@ SEE ALSO
--------
linkgit:git-remote[1]
Documentation
-------------
Documentation by Daniel Barkalow and Ilari Liusvaara
GIT
---
Part of the linkgit:git[1] suite

View File

@ -214,16 +214,6 @@ linkgit:git-fetch[1]
linkgit:git-branch[1]
linkgit:git-config[1]
Author
------
Written by Junio Hamano
Documentation
--------------
Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -123,15 +123,6 @@ need to set the configuration variable `repack.UseDeltaBaseOffset` to
is unaffected by this option as the conversion is performed on the fly
as needed in that case.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Ryan Anderson <ryan@michonline.com>
SEE ALSO
--------
linkgit:git-pack-objects[1]

View File

@ -80,17 +80,6 @@ linkgit:git-tag[1]
linkgit:git-branch[1]
linkgit:git[1]
Author
------
Written by Christian Couder <chriscool@tuxfamily.org> and Junio C
Hamano <gitster@pobox.com>, based on 'git tag' by Kristian Hogsberg
<krh@redhat.com> and Carlos Rica <jasampler@gmail.com>.
Documentation
--------------
Documentation by Christian Couder <chriscool@tuxfamily.org> and the
git-list <git@vger.kernel.org>, based on 'git tag' documentation.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -29,14 +29,6 @@ OPTIONS
<end>::
Commit to end at; defaults to HEAD.
Author
------
Written by Ryan Anderson <ryan@michonline.com> and 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

View File

@ -205,11 +205,6 @@ would conflict the same way as the test merge you resolved earlier.
'git rerere' will be run by 'git rebase' to help you resolve this
conflict.
Author
------
Written by Junio C Hamano <gitster@pobox.com>
GIT
---
Part of the linkgit:git[1] suite

View File

@ -397,15 +397,6 @@ entries:
X means any state and U means an unmerged index.
Author
------
Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -105,16 +105,6 @@ include::rev-list-options.txt[]
include::pretty-formats.txt[]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano, Jonas Fonseca
and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -308,16 +308,6 @@ $ git rev-parse --default master --verify $REV
+
but if $REV is empty, the commit object name from master will be printed.
Author
------
Written by Linus Torvalds <torvalds@osdl.org> .
Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -105,14 +105,6 @@ git revert -n master{tilde}5..master{tilde}2::
changes. The revert only modifies the working tree and the
index.
Author
------
Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
SEE ALSO
--------
linkgit:git-cherry-pick[1]

View File

@ -153,14 +153,6 @@ SEE ALSO
--------
linkgit:git-add[1]
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite

View File

@ -348,7 +348,6 @@ sendemail.confirm::
one of 'always', 'never', 'cc', 'compose', or 'auto'. See '--confirm'
in the previous section for the meaning of these values.
Use gmail as the smtp server
----------------------------
@ -363,20 +362,6 @@ Add the following section to the config file:
Note: the following perl modules are required
Net::SMTP::SSL, MIME::Base64 and Authen::SASL
Author
------
Written by Ryan Anderson <ryan@michonline.com>
git-send-email is originally based upon
send_lots_of_email.pl by Greg Kroah-Hartman.
Documentation
--------------
Documentation by Ryan Anderson
GIT
---
Part of the linkgit:git[1] suite

Some files were not shown because too many files have changed in this diff Show More