Merge branch 'gfi-maint' into gfi-master

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8fa1a0a58827e84b884d6c997686564dae1a6a58..b0550b8b1c6169f8b9184b440f4db88e2a738951 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -29,6 +29,10 @@ in a coherent way to git enlightenment ;-).
 The COMMAND is either a name of a Git command (see below) or an alias
 as defined in the configuration file (see gitlink:git-config[1]).
 
+Formatted and hyperlinked version of the latest git
+documentation can be viewed at
+`http://www.kernel.org/pub/software/scm/git/docs/`.
+
 ifdef::stalenotes[]
 [NOTE]
 ============
@@ -37,7 +41,11 @@ Documentation for older releases are available here:
 
 * link:RelNotes-1.5.1.txt[release notes for 1.5.1]
 
-* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
+* link:v1.5.1.2/git.html[documentation for release 1.5.1.2]
+
+* link:RelNotes-1.5.1.2.txt[release notes for 1.5.1.2]
+
+* link:RelNotes-1.5.1.1.txt[release notes for 1.5.1.1]
 
 * link:RelNotes-1.5.0.7.txt[release notes for 1.5.0.7]
 
@@ -315,14 +323,6 @@ git so take care if using Cogito etc.
        index file. If not specified, the default of `$GIT_DIR/index`
        is used.
 
-'_GIT_INDEX_OUTPUT'::
-       When this environment is defined, plumbing level
-       commands that update the index writes the resulting
-       index to this file, instead of `$GIT_INDEX_FILE` (or its
-       default `$GIT_DIR/index`).  This is solely meant to be
-       used by Porcelain to drive low-level plumbing.  Defining
-       this in user's environment is always an error.
-
 'GIT_OBJECT_DIRECTORY'::
        If the object storage directory is specified via this
        environment variable then the sha1 directories are created
@@ -348,6 +348,8 @@ git Commits
 'GIT_AUTHOR_DATE'::
 'GIT_COMMITTER_NAME'::
 'GIT_COMMITTER_EMAIL'::
+'GIT_COMMITTER_DATE'::
+'EMAIL'::
        see gitlink:git-commit-tree[1]
 
 git Diffs