Git 1.7.4.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

.gitignore

@@ -170,7 +170,6 @@
 /test-index-version
 /test-line-buffer
 /test-match-trees
-/test-mktemp
 /test-obj-pool
 /test-parse-options
 /test-path-utils

Documentation/RelNotes/1.7.4.3.txt

@@ -0,0 +1,32 @@
+Git v1.7.4.3 Release Notes
+==========================
+
+Fixes since v1.7.4.2
+--------------------
+
+ * "git apply" used to confuse lines updated by previous hunks as lines
+   that existed before when applying a hunk, contributing misapplication
+   of patches with offsets.
+
+ * "git branch --track" (and "git checkout --track --branch") used to
+   allow setting up a random non-branch that does not make sense to follow
+   as the "upstream".  The command correctly diagnoses it as an error.
+
+ * "git checkout $other_branch" silently removed untracked symbolic links
+   in the working tree that are in the way in order to check out paths
+   under it from the named branch.
+
+ * "git cvsimport" did not bail out immediately when the cvs server cannot
+   be reached, spewing unnecessary error messages that complain about the
+   server response that it never got.
+
+ * "git diff --quiet" did not work very well with the "--diff-filter"
+   option.
+
+ * "git grep -n" lacked a long-hand synonym --line-number.
+
+ * "git stash apply" reported the result of its operation by running
+   "git status" from the top-level of the working tree; it should (and
+   now does) run it from the user's working directory.
+
+And other minor fixes and documentation updates.

Documentation/RelNotes/1.7.4.4.txt

@@ -0,0 +1,35 @@
+Git v1.7.4.4 Release Notes
+==========================
+
+Fixes since v1.7.4.3
+--------------------
+
+ * Compilation of sha1_file.c on BSD platforms were broken due to our
+   recent use of getrlimit() without including <sys/resource.h>.
+
+ * "git config" did not diagnose incorrect configuration variable names.
+
+ * "git format-patch" did not wrap a long subject line that resulted from
+   rfc2047 encoding.
+
+ * "git instaweb" should work better again with plackup.
+
+ * "git log --max-count=4 -Sfoobar" now shows 4 commits that changes the
+   number of occurrences of string "foobar"; it used to scan only for 4
+   commits and then emitted only matching ones.
+
+ * "git log --first-parent --boundary $c^..$c" segfaulted on a merge.
+
+ * "git pull" into an empty branch should have behaved as if
+   fast-forwarding from emptiness to the version being pulled, with
+   the usual protection against overwriting untracked files.
+
+ * "git submodule" that is run while a merge in the superproject is in
+   conflicted state tried to process each conflicted submodule up to
+   three times.
+
+ * "git status" spent all the effort to notice racily-clean index entries
+   but didn't update the index file to help later operations go faster in
+   some cases.
+
+And other minor fixes and documentation updates.

Documentation/RelNotes/1.7.5.txt

@@ -1,140 +0,0 @@
-Git v1.7.5 Release Notes (draft)
-========================
-
-Updates since v1.7.4
---------------------
-
- * Various MinGW portability fixes.
-
- * Various git-p4 enhancements (in contrib).
-
- * Various vcs-svn enhancements.
-
- * Various git-gui updates (0.14.0).
-
- * Update to more modern HP-UX port.
-
- * The codebase is getting prepared for i18n/l10n; no translated/translatable
-   strings in the code yet.
-
- * The bash completion script can now complete symmetric difference
-   for "git diff" command, e.g. "git diff ...bra<TAB>".
-
- * The default minimum length of abbreviated and unique object names
-   can now be configured by setting the core.abbrev configuration
-   variable.
-
- * "git apply -v" reports offset lines when the patch does not apply at
-   the exact location recorded in the diff output.
-
- * "git branch --track" (and "git checkout --track --branch") used to
-   allow setting up a random non-branch that does not make sense to follow
-   as the "upstream".  The command correctly diagnoses it as an error.
-
- * "git config" used to be also known as "git repo-config", but the old
-   name is now officially deprecated.
-
- * "git checkout --detach <commit>" is a more user friendly synonym for
-   "git checkout <commit>^0".
-
- * "git checkout" performed on detached HEAD gives a warning and
-   advice when the commit being left behind will become unreachable from
-   any branch or tag.
-
- * "git cherry-pick" and "git revert" can be told to use a custom merge
-   strategy, similar to "git rebase".
-
- * "git cherry-pick" remembers which commit failed to apply when it is
-   stopped by conflicts, making it unnecessary to use "commit -c $commit"
-   to conclude it.
-
- * "git cvsimport" bails out immediately when the cvs server cannot be
-   reached, without spewing unnecessary error messages that complain about
-   the server response it never got.
-
- * "git fetch" vs "git upload-pack" transfer learned 'no-done'
-   protocol extension to save one round-trip after the content
-   negotiation is done. This saves one HTTP RPC, reducing the overall
-   latency for a trivial fetch.
-
- * "git grep -f <filename>" learned to treat "-" as "read from the
-   standard input stream".
-
- * "git grep --no-index" did not honor pathspecs correctly, returning
-   paths outside the specified area.
-
- * "git log" type commands now understand globbing pathspecs.  You
-   can say "git log -- '*.txt'" for example.
-
- * "git log" family of commands learned --cherry and --cherry-mark
-   options that can be used to view two diverged branches while omitting
-   or highlighting equivalent changes that appear on both sides of a
-   symmetric difference (e.g. "log --cherry A...B").
-
- * "git mergetool" learned how to drive "beyond compare 3" as well.
-
- * "git rerere forget" without pathspec used to forget all the saved
-   conflicts that relate to the current merge; it now requires you to
-   give it pathspecs.
-
- * "git rev-list --objects $revs -- $pathspec" now limits the objects listed
-   in its output properly with the pathspec, in preparation for narrow
-   clones.
-
- * "git push" with no parameters gives better advice messages when
-   "tracking" is used as the push.default semantics or there is no remote
-   configured yet.
-
- * "git rerere" learned a new subcommand "remaining" that is similar to
-   "status" and lists the paths that had conflicts which are known to
-   rerere, but excludes the paths that have already been marked as
-   resolved in the index from its output.  "git mergetool" has been
-   updated to use this facility.
-
- * A possible value to the "push.default" configuration variable,
-   'tracking', gained a synonym that more naturally describes what it
-   does, 'upstream'.
-
-Also contains various documentation updates.
-
-
-Fixes since v1.7.4
-------------------
-
-All of the fixes in the v1.7.4.X maintenance series are included in this
-release, unless otherwise noted.
-
- * "git apply" used to confuse lines updated by previous hunks as lines
-   that existed before when applying a hunk, contributing misapplication
-   of patches with offsets.
-
- * "git checkout $other_branch" silently removed untracked symbolic links
-   in the working tree that are in the way in order to check out paths
-   under it from the named branch (js/checkout-untracked-symlink).
-
- * "git diff --quiet" did not work very well with the "--diff-filter"
-   option (jc/maint-diff-q-filter).
-
- * "git fetch" from a client that is mostly following the remote
-   needlessly told all of its refs to the server for both sides to
-   compute the set of objects that need to be transferred efficiently,
-   instead of stopping when the server heard enough. In a project with
-   many tags, this turns out to be extremely wasteful, especially over
-   the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1).
-
- * "git fetch" run from a repository that uses the same repository as
-   its alternate object store as the repository it is fetching from
-   did not tell the server that it already has access to objects
-   reachable from the refs in their common alternate object store,
-   causing it to fetch unnecessary objects (jc/maint-fetch-alt).
-
- * "git stash apply" reported the result of its operation by running
-   "git status" from the top-level of the working tree; it should (and
-   now does) run it from the user's working directory
-   (pk/stash-apply-status-relative).
-
----
-exec >/var/tmp/1
-O=v1.7.5-rc0
-echo O=$(git describe 'master')
-git shortlog --no-merges ^maint ^$O master

Documentation/config.txt

@@ -320,7 +320,7 @@ core.worktree::
 	Set the path to the root of the working tree.
 	This can be overridden by the GIT_WORK_TREE environment
 	variable and the '--work-tree' command line option.
-	The value can an absolute path or relative to the path to
+	The value can be an absolute path or relative to the path to
 	the .git directory, which is either specified by --git-dir
 	or GIT_DIR, or automatically discovered.
 	If --git-dir or GIT_DIR is specified but none of

Documentation/git-add.txt

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

Documentation/git-am.txt

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

Documentation/git-annotate.txt

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

Documentation/git-apply.txt

@@ -246,10 +246,20 @@ 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

Documentation/git-archimport.txt

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

Documentation/git-archive.txt

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

Documentation/git-bisect.txt

@@ -342,6 +342,14 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
 This shows that you can do without a run script if you write the test
 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],

Documentation/git-blame.txt

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

Documentation/git-branch.txt

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

Documentation/git-bundle.txt

@@ -201,6 +201,10 @@ 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

Documentation/git-cat-file.txt

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

Documentation/git-check-attr.txt

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

Documentation/git-checkout-index.txt

@@ -172,6 +172,18 @@ $ 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

Documentation/git-checkout.txt

@@ -9,7 +9,6 @@ SYNOPSIS
 --------
 [verse]
 'git checkout' [-q] [-f] [-m] [<branch>]
-'git checkout' [-q] [-f] [-m] [--detach] [<commit>]
 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
 'git checkout' --patch [<tree-ish>] [--] [<paths>...]
@@ -23,10 +22,9 @@ branch.
 
 'git checkout' [<branch>]::
 'git checkout' -b|-B <new_branch> [<start point>]::
-'git checkout' [--detach] [<commit>]::
 
 	This form switches branches by updating the index, working
-	tree, and HEAD to reflect the specified branch or commit.
+	tree, and HEAD to reflect the specified branch.
 +
 If `-b` is given, a new branch is created as if linkgit:git-branch[1]
 were called and then checked out; in this case you can
@@ -117,13 +115,6 @@ explicitly give a name with '-b' in such a case.
 	Create the new branch's reflog; see linkgit:git-branch[1] for
 	details.
 
---detach::
-	Rather than checking out a branch to work on it, check out a
-	commit for inspection and discardable experiments.
-	This is the default behavior of "git checkout <commit>" when
-	<commit> is not a branch name.  See the "DETACHED HEAD" section
-	below for details.
-
 --orphan::
 	Create a new 'orphan' branch, named <new_branch>, started from
 	<start_point> and switch to it.  The first commit made on this
@@ -213,141 +204,43 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 
 
 
-DETACHED HEAD
+Detached HEAD
 -------------
-HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each
-branch refers to a specific commit. Let's look at a repo with three
-commits, one of them tagged, and with branch 'master' checked out:
+
+It is sometimes useful to be able to 'checkout' a commit that is
+not at the tip of one of your branches.  The most obvious
+example is to check out the commit at a tagged official release
+point, like this:
 
 ------------
-	   HEAD (refers to branch 'master')
-	    |
-	    v
-a---b---c  branch 'master' (refers to commit 'c')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
+$ git checkout v2.6.18
 ------------
 
-When a commit is created in this state, the branch is updated to refer to
-the new commit. Specifically, 'git commit' creates a new commit 'd', whose
-parent is commit 'c', and then updates branch 'master' to refer to new
-commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers
-to commit 'd':
+Earlier versions of git did not allow this and asked you to
+create a temporary branch using the `-b` option, but starting from
+version 1.5.0, the above command 'detaches' your HEAD from the
+current branch and directly points at the commit named by the tag
+(`v2.6.18` in the example above).
+
+You can use all git commands while in this state.  You can use
+`git reset --hard $othercommit` to further move around, for
+example.  You can make changes and create a new commit on top of
+a detached HEAD.  You can even create a merge by using `git
+merge $othercommit`.
+
+The state you are in while your HEAD is detached is not recorded
+by any branch (which is natural --- you are not on any branch).
+What this means is that you can discard your temporary commits
+and merges by switching back to an existing branch (e.g. `git
+checkout master`), and a later `git prune` or `git gc` would
+garbage-collect them.  If you did this by mistake, you can ask
+the reflog for HEAD where you were, e.g.
 
 ------------
-$ edit; git add; git commit
-
-	       HEAD (refers to branch 'master')
-		|
-		v
-a---b---c---d  branch 'master' (refers to commit 'd')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
-------------
-
-It is sometimes useful to be able to checkout a commit that is not at
-the tip of any named branch, or even to create a new commit that is not
-referenced by a named branch. Let's look at what happens when we
-checkout commit 'b' (here we show two ways this may be done):
-
-------------
-$ git checkout v2.0  # or
-$ git checkout master^^
-
-   HEAD (refers to commit 'b')
-    |
-    v
-a---b---c---d  branch 'master' (refers to commit 'd')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
-------------
-
-Notice that regardless of which checkout command we use, HEAD now refers
-directly to commit 'b'. This is known as being in detached HEAD state.
-It means simply that HEAD refers to a specific commit, as opposed to
-referring to a named branch. Let's see what happens when we create a commit:
-
-------------
-$ edit; git add; git commit
-
-     HEAD (refers to commit 'e')
-      |
-      v
-      e
-     /
-a---b---c---d  branch 'master' (refers to commit 'd')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
-------------
-
-There is now a new commit 'e', but it is referenced only by HEAD. We can
-of course add yet another commit in this state:
-
-------------
-$ edit; git add; git commit
-
-	 HEAD (refers to commit 'f')
-	  |
-	  v
-      e---f
-     /
-a---b---c---d  branch 'master' (refers to commit 'd')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
-------------
-
-In fact, we can perform all the normal git operations. But, let's look
-at what happens when we then checkout master:
-
-------------
-$ git checkout master
-
-	       HEAD (refers to branch 'master')
-      e---f     |
-     /          v
-a---b---c---d  branch 'master' (refers to commit 'd')
-    ^
-    |
-  tag 'v2.0' (refers to commit 'b')
-------------
-
-It is important to realize that at this point nothing refers to commit
-'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted
-by the routine git garbage collection process, unless we create a reference
-before that happens. If we have not yet moved away from commit 'f',
-any of these will create a reference to it:
-
-------------
-$ git checkout -b foo   <1>
-$ git branch foo        <2>
-$ git tag foo           <3>
-------------
-
-<1> creates a new branch 'foo', which refers to commit 'f', and then
-updates HEAD to refer to branch 'foo'. In other words, we'll no longer
-be in detached HEAD state after this command.
-
-<2> similarly creates a new branch 'foo', which refers to commit 'f',
-but leaves HEAD detached.
-
-<3> creates a new tag 'foo', which refers to commit 'f',
-leaving HEAD detached.
-
-If we have moved away from commit 'f', then we must first recover its object
-name (typically by using git reflog), and then we can create a reference to
-it. For example, to see the last two commits to which HEAD referred, we
-can use either of these commands:
-
-------------
-$ git reflog -2 HEAD # or
 $ git log -g -2 HEAD
 ------------
 
+
 EXAMPLES
 --------
 
@@ -422,6 +315,15 @@ $ 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

Documentation/git-cherry-pick.txt

@@ -16,25 +16,6 @@ Given one or more existing commits, apply the change each one
 introduces, recording a new commit for each.  This requires your
 working tree to be clean (no modifications from the HEAD commit).
 
-When it is not obvious how to apply a change, the following
-happens:
-
-1. The current branch and `HEAD` pointer stay at the last commit
-   successfully made.
-2. The `CHERRY_PICK_HEAD` ref is set to point at the commit that
-   introduced the change that is difficult to apply.
-3. Paths in which the change applied cleanly are updated both
-   in the index file and in your working tree.
-4. For conflicting paths, the index file records up to three
-   versions, as described in the "TRUE MERGE" section of
-   linkgit:git-merge[1].  The working tree files will include
-   a description of the conflict bracketed by the usual
-   conflict markers `<<<<<<<` and `>>>>>>>`.
-5. No other modifications are made.
-
-See linkgit:git-merge[1] for some hints on resolving such
-conflicts.
-
 OPTIONS
 -------
 <commit>...::
@@ -98,16 +79,6 @@ effect to your index in a row.
 	cherry-pick'ed commit, then a fast forward to this commit will
 	be performed.
 
---strategy=<strategy>::
-	Use the given merge strategy.  Should only be used once.
-	See the MERGE STRATEGIES section in linkgit:git-merge[1]
-	for details.
-
--X<option>::
---strategy-option=<option>::
-	Pass the merge strategy-specific option through to the
-	merge strategy.  See linkgit:git-merge[1] for details.
-
 EXAMPLES
 --------
 git cherry-pick master::
@@ -149,27 +120,13 @@ git rev-list --reverse master \-- README | git cherry-pick -n --stdin::
 	so the result can be inspected and made into a single new
 	commit if suitable.
 
-The following sequence attempts to backport a patch, bails out because
-the code the patch applies to has changed too much, and then tries
-again, this time exercising more care about matching up context lines.
+Author
+------
+Written by Junio C Hamano <gitster@pobox.com>
 
-------------
-$ git cherry-pick topic^             <1>
-$ git diff                           <2>
-$ git reset --merge ORIG_HEAD        <3>
-$ git cherry-pick -Xpatience topic^  <4>
-------------
-<1> apply the change that would be shown by `git show topic^`.
-In this example, the patch does not apply cleanly, so
-information about the conflict is written to the index and
-working tree and no new commit results.
-<2> summarize changes to be reconciled
-<3> cancel the cherry-pick.  In other words, return to the
-pre-cherry-pick state, preserving any local modifications you had in
-the working tree.
-<4> try to apply the change introduced by `topic^` again,
-spending extra time to avoid mistakes based on incorrectly matching
-context lines.
+Documentation
+--------------
+Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 SEE ALSO
 --------

Documentation/git-cherry.txt

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

Documentation/git-citool.txt

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

Documentation/git-clean.txt

@@ -61,6 +61,12 @@ 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

Documentation/git-clone.txt

@@ -236,6 +236,17 @@ $ 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

Documentation/git-commit-tree.txt

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

Documentation/git-commit.txt

@@ -84,10 +84,9 @@ OPTIONS
 	linkgit:git-rebase[1] for details.
 
 --reset-author::
-	When used with -C/-c/--amend options, or when committing after a
-	a conflicting cherry-pick, declare that the authorship of the
-	resulting commit now belongs of the committer. This also renews
-	the author timestamp.
+	When used with -C/-c/--amend options, declare that the
+	authorship of the resulting commit now belongs of the committer.
+	This also renews the author timestamp.
 
 --short::
 	When doing a dry-run, give the output in the short-format. See
@@ -397,6 +396,12 @@ 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

Documentation/git-config.txt

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

Documentation/git-count-objects.txt

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

Documentation/git-cvsexportcommit.txt

@@ -112,6 +112,14 @@ $ 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

Documentation/git-cvsimport.txt

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

Documentation/git-cvsserver.txt

@@ -391,6 +391,22 @@ 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

Documentation/git-daemon.txt

@@ -279,6 +279,17 @@ 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

Documentation/git-describe.txt

@@ -156,6 +156,17 @@ 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

Documentation/git-diff-files.txt

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

Documentation/git-diff-index.txt

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

Documentation/git-diff-tree.txt

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

Documentation/git-diff.txt

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

Documentation/git-difftool.txt

@@ -31,8 +31,8 @@ OPTIONS
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
 	Valid merge tools are:
-	araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
-	kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
+	kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
+	ecmerge, diffuse, opendiff, p4merge and araxis.
 +
 If a diff tool is not specified, 'git difftool'
 will use the configuration variable `diff.tool`.  If the
@@ -109,6 +109,15 @@ 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

Documentation/git-fast-export.txt

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

Documentation/git-fast-import.txt

@@ -78,10 +78,6 @@ OPTIONS
 	set of marks.  If a mark is defined to different values,
 	the last file wins.
 
---import-marks-if-exists=<file>::
-	Like --import-marks but instead of erroring out, silently
-	skips the file if it does not exist.
-
 --relative-marks::
 	After specifying --relative-marks= the paths specified
 	with --import-marks= and --export-marks= are relative
@@ -196,8 +192,7 @@ especially when a higher level language such as Perl, Python or
 Ruby is being used.
 
 fast-import is very strict about its input.  Where we say SP below we mean
-*exactly* one space.  Likewise LF means one (and only one) linefeed
-and HT one (and only one) horizontal tab.
+*exactly* one space.  Likewise LF means one (and only one) linefeed.
 Supplying additional whitespace characters will cause unexpected
 results, such as branch names or file names with leading or trailing
 spaces in their name, or early termination of fast-import when it encounters
@@ -335,11 +330,6 @@ and control the current import process.  More detailed discussion
 	format to the file descriptor set with `--cat-blob-fd` or
 	`stdout` if unspecified.
 
-`ls`::
-	Causes fast-import to print a line describing a directory
-	entry in 'ls-tree' format to the file descriptor set with
-	`--cat-blob-fd` or `stdout` if unspecified.
-
 `feature`::
 	Require that fast-import supports the specified feature, or
 	abort if it does not.
@@ -925,55 +915,6 @@ This command can be used anywhere in the stream that comments are
 accepted.  In particular, the `cat-blob` command can be used in the
 middle of a commit but not in the middle of a `data` command.
 
-`ls`
-~~~~
-Prints information about the object at a path to a file descriptor
-previously arranged with the `--cat-blob-fd` argument.  This allows
-printing a blob from the active commit (with `cat-blob`) or copying a
-blob or tree from a previous commit for use in the current one (with
-`filemodify`).
-
-The `ls` command can be used anywhere in the stream that comments are
-accepted, including the middle of a commit.
-
-Reading from the active commit::
-	This form can only be used in the middle of a `commit`.
-	The path names a directory entry within fast-import's
-	active commit.  The path must be quoted in this case.
-+
-....
-	'ls' SP <path> LF
-....
-
-Reading from a named tree::
-	The `<dataref>` can be a mark reference (`:<idnum>`) or the
-	full 40-byte SHA-1 of a Git tag, commit, or tree object,
-	preexisting or waiting to be written.
-	The path is relative to the top level of the tree
-	named by `<dataref>`.
-+
-....
-	'ls' SP <dataref> SP <path> LF
-....
-
-See `filemodify` above for a detailed description of `<path>`.
-
-Output uses the same format as `git ls-tree <tree> {litdd} <path>`:
-
-====
-	<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF
-====
-
-The <dataref> represents the blob, tree, or commit object at <path>
-and can be used in later 'cat-blob', 'filemodify', or 'ls' commands.
-
-If there is no file or subtree at that path, 'git fast-import' will
-instead report
-
-====
-	missing SP <path> LF
-====
-
 `feature`
 ~~~~~~~~~
 Require that fast-import supports the specified feature, or abort if
@@ -1001,10 +942,8 @@ import-marks::
 	any "feature import-marks" command in the stream.
 
 cat-blob::
-ls::
-	Require that the backend support the 'cat-blob' or 'ls' command.
-	Versions of fast-import not supporting the specified command
-	will exit with a message indicating so.
+	Ignored.  Versions of fast-import not supporting the
+	"cat-blob" command will exit with a message indicating so.
 	This lets the import error out early with a clear message,
 	rather than wasting time on the early part of an import
 	before the unsupported command is detected.
@@ -1350,6 +1289,14 @@ 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

Documentation/git-fetch-pack.txt

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

Documentation/git-fetch.txt

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

Documentation/git-filter-branch.txt

@@ -361,7 +361,7 @@ git filter-branch --index-filter \
 	'git ls-files -s | sed "s-\t\"*-&newsubdir/-" |
 		GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
 			git update-index --index-info &&
-	 mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD
+	 mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
 ---------------------------------------------------------------
 
 
@@ -405,6 +405,16 @@ 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

Documentation/git-fmt-merge-msg.txt

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

Documentation/git-format-patch.txt

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

Documentation/git-fsck-objects.txt

@@ -15,7 +15,3 @@ DESCRIPTION
 
 This is a synonym for linkgit:git-fsck[1].  Please refer to the
 documentation of that command.
-
-GIT
----
-Part of the linkgit:git[1] suite

Documentation/git-fsck.txt

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

Documentation/git-gc.txt

@@ -151,6 +151,10 @@ 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

Documentation/git-get-tar-commit-id.txt

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

Documentation/git-grep.txt

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

Documentation/git-gui.txt

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

Documentation/git-hash-object.txt

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

Documentation/git-help.txt

@@ -171,6 +171,17 @@ $ 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

Documentation/git-http-fetch.txt

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

Documentation/git-http-push.txt

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

Documentation/git-imap-send.txt

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

Documentation/git-index-pack.txt

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

Documentation/git-init-db.txt

@@ -16,7 +16,3 @@ DESCRIPTION
 
 This is a synonym for linkgit:git-init[1].  Please refer to the
 documentation of that command.
-
-GIT
----
-Part of the linkgit:git[1] suite

Documentation/git-init.txt

@@ -134,6 +134,15 @@ $ 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

Documentation/git-instaweb.txt

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

Documentation/git-log.txt

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

Documentation/git-lost-found.txt

@@ -67,6 +67,15 @@ $ 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

Documentation/git-ls-files.txt

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

Documentation/git-ls-remote.txt

@@ -67,6 +67,10 @@ 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

Documentation/git-ls-tree.txt

@@ -95,6 +95,18 @@ 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

Documentation/git-mailinfo.txt

@@ -80,6 +80,17 @@ 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

Documentation/git-mailsplit.txt

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

Documentation/git-merge-base.txt

@@ -102,6 +102,14 @@ 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],

Documentation/git-merge-file.txt

@@ -86,6 +86,17 @@ 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

Documentation/git-merge-index.txt

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

Documentation/git-merge-one-file.txt

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

Documentation/git-merge-tree.txt

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

Documentation/git-merge.txt

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

Documentation/git-mergetool--lib.txt

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

Documentation/git-mergetool.txt

@@ -26,8 +26,8 @@ OPTIONS
 --tool=<tool>::
 	Use the merge resolution program specified by <tool>.
 	Valid merge tools are:
-	araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
-	meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
+	kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
+	diffuse, tortoisemerge, opendiff, p4merge and araxis.
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable `merge.tool`.  If the
@@ -82,6 +82,14 @@ 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

Documentation/git-mktag.txt

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

Documentation/git-mktree.txt

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

Documentation/git-mv.txt

@@ -39,6 +39,17 @@ 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

Documentation/git-name-rev.txt

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

Documentation/git-pack-objects.txt

@@ -192,13 +192,18 @@ self-contained. Use `git index-pack --fix-thin`
 --delta-base-offset::
 	A packed archive can express the base object of a delta as
 	either a 20-byte object name or as an offset in the
-	stream, but older versions of git don't understand the
+	stream, but ancient versions of git don't understand the
 	latter.  By default, 'git pack-objects' only uses the
 	former format for better compatibility.  This option
 	allows the command to use the latter format for
 	compactness.  Depending on the average delta chain
 	length, this option typically shrinks the resulting
 	packfile by 3-5 per-cent.
++
+Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]),
+`git repack` (see linkgit:git-repack[1]) pass this option by default
+in modern git when they put objects in your repository into pack files.
+So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
 
 --threads=<n>::
 	Specifies the number of threads to spawn when searching for best
@@ -219,6 +224,15 @@ 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]

Documentation/git-pack-redundant.txt

@@ -38,6 +38,14 @@ 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]

Documentation/git-pack-refs.txt

@@ -56,6 +56,11 @@ 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

Documentation/git-parse-remote.txt

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

Documentation/git-patch-id.txt

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

Documentation/git-peek-remote.txt

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

Documentation/git-prune-packed.txt

@@ -36,6 +36,14 @@ 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]

Documentation/git-prune.txt

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

Documentation/git-pull.txt

@@ -224,6 +224,18 @@ 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

Documentation/git-push.txt

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

Documentation/git-quiltimport.txt

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

Documentation/git-read-tree.txt

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

Documentation/git-rebase.txt

@@ -66,9 +66,8 @@ would be:
     D---E---F---G master
 ------------
 
-*NOTE:* The latter form is just a short-hand of `git checkout topic`
-followed by `git rebase master`. When rebase exits `topic` will
-remain the checked-out branch.
+The latter form is just a short-hand of `git checkout topic`
+followed by `git rebase master`.
 
 If the upstream branch already contains a change you have made (e.g.,
 because you mailed a patch which was applied upstream), then that commit
@@ -659,6 +658,7 @@ 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,6 +681,15 @@ 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

Documentation/git-receive-pack.txt

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

Documentation/git-reflog.txt

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

Documentation/git-relink.txt

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

Documentation/git-remote-helpers.txt

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

Documentation/git-remote.txt

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

Documentation/git-repack.txt

@@ -123,6 +123,15 @@ 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]

Documentation/git-replace.txt

@@ -80,6 +80,17 @@ 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

Documentation/git-repo-config.txt

@@ -16,7 +16,3 @@ DESCRIPTION
 
 This is a synonym for linkgit:git-config[1].  Please refer to the
 documentation of that command.
-
-GIT
----
-Part of the linkgit:git[1] suite