Merge branch 'maint'

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 9a7474798963c22b554f49db015c180b9ae7ea4f..273ca173d48f4a14f46d3cc4416603555503f4eb 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -21,29 +21,48 @@ and full access to internals.
 See this link:tutorial.html[tutorial] to get started, then see
 link:everyday.html[Everyday Git] for a useful minimum set of commands, and
 "man git-commandname" for documentation of each command.  CVS users may
-also want to read link:cvs-migration.html[CVS migration].
-link:user-manual.html[Git User's Manual] is still work in
-progress, but when finished hopefully it will guide a new user
-in a coherent way to git enlightenment ;-).
+also want to read link:cvs-migration.html[CVS migration].  See
+link:user-manual.html[Git User's Manual] for a more in-depth
+introduction.
 
 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]
 ============
 You are reading the documentation for the latest version of git.
 Documentation for older releases are available here:
 
-* link:v1.5.0.2/git.html[documentation for release 1.5.0.2]
+* link:RelNotes-1.5.1.txt[release notes for 1.5.1]
+
+* link:v1.5.1.4/git.html[documentation for release 1.5.1.4]
+
+* link:RelNotes-1.5.1.4.txt[release notes for 1.5.1.4]
+
+* link:RelNotes-1.5.1.3.txt[release notes for 1.5.1.3]
+
+* link:RelNotes-1.5.1.2.txt[release notes for 1.5.1.2]
 
-* link:v1.5.0.2/RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
+* link:RelNotes-1.5.1.1.txt[release notes for 1.5.1.1]
 
-* link:v1.5.0.1/RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]
+* link:RelNotes-1.5.0.7.txt[release notes for 1.5.0.7]
 
-* link:v1.5.0/git.html[documentation for release 1.5.0]
+* link:RelNotes-1.5.0.6.txt[release notes for 1.5.0.6]
 
-* link:v1.5.0/RelNotes-1.5.0.txt[release notes for 1.5.0]
+* link:RelNotes-1.5.0.5.txt[release notes for 1.5.0.5]
+
+* link:RelNotes-1.5.0.3.txt[release notes for 1.5.0.3]
+
+* link:RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
+
+* link:RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]
+
+* link:RelNotes-1.5.0.txt[release notes for 1.5.0]
 
 * link:v1.4.4.4/git.html[documentation for release 1.4.4.4]
 
@@ -241,6 +260,12 @@ Identifier Terminology
        operate on a <tree> object but automatically dereferences
        <commit> and <tag> objects that point at a <tree>.
 
+<commit-ish>::
+       Indicates a commit or tag object name.  A
+       command that takes a <commit-ish> argument ultimately wants to
+       operate on a <commit> object but automatically dereferences
+       <tag> objects that point at a <commit>.
+
 <type>::
        Indicates that an object type is required.
        Currently one of: `blob`, `tree`, `commit`, or `tag`.
@@ -326,6 +351,8 @@ git Commits
 'GIT_AUTHOR_DATE'::
 'GIT_COMMITTER_NAME'::
 'GIT_COMMITTER_EMAIL'::
+'GIT_COMMITTER_DATE'::
+'EMAIL'::
        see gitlink:git-commit-tree[1]
 
 git Diffs