Autogenerated HTML docs for v1.4.4.2-g82dca

diff --git a/config.txt b/config.txt
index a3587f8..ceac54b 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -79,8 +79,11 @@ core.logAllRefUpdates::
        file is automatically created for branch heads.
 
        This information can be used to determine what commit
-       was the tip of a branch "2 days ago".  This value is
-       false by default (no automated creation of log files).
+       was the tip of a branch "2 days ago".
+
+       This value is true by default in a repository that has
+       a working directory associated with it, and false by
+       default in a bare repository.
 
 core.repositoryFormatVersion::
        Internal variable identifying the repository format and layout
@@ -166,8 +169,8 @@ color.status::
 color.status.<slot>::
        Use customized color for status colorization. `<slot>` is
        one of `header` (the header text of the status message),
-       `updated` (files which are updated but not committed),
-       `changed` (files which are changed but not updated in the index),
+       `added` or `updated` (files which are added but not committed),
+       `changed` (files which are changed but not added in the index),
        or `untracked` (files which are not tracked by git). The values of
        these variables may be specified as in color.diff.<slot>.
 

diff --git a/core-tutorial.html b/core-tutorial.html
index 88c3e5c..8927cbb 100644 (file)
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -319,7 +319,7 @@ $ git-init-db</tt></pre>
 <p>to which git will reply</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>defaulting to local storage area</tt></pre>\r
+<pre><tt>Initialized empty Git repository in .git/</tt></pre>\r
 </div></div>\r
 <p>which is just git's way of saying that you haven't been doing anything\r
 strange, and that it will have created a local <tt>.git</tt> directory setup for\r
@@ -598,16 +598,9 @@ all with a sequence of simple shell commands:</p>
 $ commit=$(echo 'Initial commit' | git-commit-tree $tree)\r
 $ git-update-ref HEAD $commit</tt></pre>\r
 </div></div>\r
-<p>which will say:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb</tt></pre>\r
-</div></div>\r
-<p>just to warn you about the fact that it created a totally new commit\r
-that is not related to anything else. Normally you do this only <strong>once</strong>\r
-for a project ever, and all later commits will be parented on top of an\r
-earlier commit, and you'll never see this "Committing initial tree"\r
-message ever again.</p>\r
+<p>In this case this creates a totally new commit that is not related to\r
+anything else. Normally you do this only <strong>once</strong> for a project ever, and\r
+all later commits will be parented on top of an earlier commit.</p>\r
 <p>Again, normally you'd never actually do this by hand. There is a\r
 helpful script called <tt>git commit</tt> that will do all of this for you. So\r
 you could have just written <tt>git commit</tt>\r
@@ -2011,7 +2004,7 @@ to follow, not easier.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:43 UTC\r
+Last updated 16-Dec-2006 07:43:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/core-tutorial.txt b/core-tutorial.txt
index 47505aa..5ea6117 100644 (file)
--- a/core-tutorial.txt
+++ b/core-tutorial.txt
@@ -57,7 +57,7 @@ $ git-init-db
 to which git will reply
 
 ----------------
-defaulting to local storage area
+Initialized empty Git repository in .git/
 ----------------
 
 which is just git's way of saying that you haven't been doing anything
@@ -336,17 +336,9 @@ $ commit=$(echo 'Initial commit' | git-commit-tree $tree)
 $ git-update-ref HEAD $commit
 ------------------------------------------------
 
-which will say:
-
-----------------
-Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb
-----------------
-
-just to warn you about the fact that it created a totally new commit
-that is not related to anything else. Normally you do this only *once*
-for a project ever, and all later commits will be parented on top of an
-earlier commit, and you'll never see this "Committing initial tree"
-message ever again.
+In this case this creates a totally new commit that is not related to
+anything else. Normally you do this only *once* for a project ever, and
+all later commits will be parented on top of an earlier commit.
 
 Again, normally you'd never actually do this by hand. There is a
 helpful script called `git commit` that will do all of this for you. So

diff --git a/diff-options.txt b/diff-options.txt
index 9cdd171..f12082e 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -21,6 +21,11 @@
        deleted lines in decimal notation and pathname without
        abbreviation, to make it more machine friendly.
 
+--shortstat::
+       Output only the last line of the --stat format containing total
+       number of modified files, as well as number of added and deleted
+       lines.
+
 --summary::
        Output a condensed summary of extended header information
        such as creations, renames and mode changes.

diff --git a/git-commit.html b/git-commit.html
index b163557..087aa3e 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -438,6 +438,14 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
+-q|--quiet\r
+</dt>\r
+<dd>\r
+<p>\r
+        Supress commit summary message.\r
+</p>\r
+</dd>\r
+<dt>\r
 --\r
 </dt>\r
 <dd>\r
@@ -571,7 +579,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2006 21:32:05 UTC\r
+Last updated 16-Dec-2006 07:43:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index 97d66ef..0b74cd7 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -113,6 +113,9 @@ but can be used to amend a merge commit.
        as well.  This is usually not what you want unless you
        are concluding a conflicted merge.
 
+-q|--quiet::
+       Supress commit summary message.
+
 \--::
        Do not interpret any more arguments as options.
 

diff --git a/git-diff-files.html b/git-diff-files.html
index 923f629..abcc5c8 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -338,6 +338,16 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\r
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -974,7 +984,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Dec-2006 08:58:57 UTC\r
+Last updated 16-Dec-2006 07:43:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 66c5d95..8b4c6a0 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -339,6 +339,16 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\r
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -1064,7 +1074,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Dec-2006 08:58:58 UTC\r
+Last updated 16-Dec-2006 07:43:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 34b70dc..8c5fdb0 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -336,6 +336,16 @@ unmerged index file.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\r
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -948,7 +958,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Dec-2006 08:58:59 UTC\r
+Last updated 16-Dec-2006 07:43:49 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 2b08f43..bd0a9bf 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -341,6 +341,16 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\r
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -1256,7 +1266,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Dec-2006 08:59:00 UTC\r
+Last updated 16-Dec-2006 07:43:50 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 8538378..bb0816d 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -272,7 +272,7 @@ git-diff(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-diff</em> [ --diff-options ] &lt;tree-ish&gt;{0,2} [&lt;path&gt;&#8230;]</p>\r
+<p><em>git-diff</em> [ --diff-options ] &lt;tree-ish&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -303,7 +303,7 @@ tree and the index file, or the index file and the working tree.</p>
 </p>\r
 </dd>\r
 <dt>\r
-<em>git-diff</em> [--options] &lt;commit&gt; &#8212; [&lt;path&gt;&#8230;]\r
+<em>git-diff</em> [--options] &lt;commit&gt; [--] [&lt;path&gt;&#8230;]\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -315,7 +315,7 @@ tree and the index file, or the index file and the working tree.</p>
 </p>\r
 </dd>\r
 <dt>\r
-<em>git-diff</em> [--options] &lt;commit&gt; &lt;commit&gt; &#8212; [&lt;path&gt;&#8230;]\r
+<em>git-diff</em> [--options] &lt;commit&gt; &lt;commit&gt; [--] [&lt;path&gt;&#8230;]\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -385,6 +385,16 @@ any &lt;tree-ish&gt;.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\r
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -805,7 +815,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Dec-2006 11:19:59 UTC\r
+Last updated 16-Dec-2006 07:43:51 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index 127d68c..10fdf88 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
-'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]
 
 DESCRIPTION
 -----------
@@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree.
        would want comparison with the latest commit, so if you
        do not give <commit>, it defaults to HEAD.
 
-'git-diff' [--options] <commit> -- [<path>...]::
+'git-diff' [--options] <commit> [--] [<path>...]::
 
        This form is to view the changes you have in your
        working tree relative to the named <commit>.  You can
@@ -38,7 +38,7 @@ tree and the index file, or the index file and the working tree.
        branch name to compare with the tip of a different
        branch.
 
-'git-diff' [--options] <commit> <commit> -- [<path>...]::
+'git-diff' [--options] <commit> <commit> [--] [<path>...]::
 
        This form is to view the changes between two <commit>,
        for example, tips of two branches.

diff --git a/git-repo-config.html b/git-repo-config.html
index bdeb43e..dd411c6 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -274,6 +274,7 @@ git-repo-config(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-repo-config</em> [--global] [type] name [value [value_regex]]\r
+<em>git-repo-config</em> [--global] [type] --add name value\r
 <em>git-repo-config</em> [--global] [type] --replace-all name [value [value_regex]]\r
 <em>git-repo-config</em> [--global] [type] --get name [value_regex]\r
 <em>git-repo-config</em> [--global] [type] --get-all name [value_regex]\r
@@ -286,7 +287,8 @@ git-repo-config(1) Manual Page
 <p>You can query/set/replace/unset options with this command. The name is\r
 actually the section and the key separated by a dot, and the value will be\r
 escaped.</p>\r
-<p>If you want to set/unset an option which can occur on multiple\r
+<p>Multiple lines can be added to an option by using the <em>--add</em> option.\r
+If you want to update or unset an option which can occur on multiple\r
 lines, a POSIX regexp <tt>value_regex</tt> needs to be given.  Only the\r
 existing values that match the regexp are updated or unset.  If\r
 you want to handle the lines that do <strong>not</strong> match the regex, just\r
@@ -348,6 +350,15 @@ you use --global option without $HOME being properly set.
 </p>\r
 </dd>\r
 <dt>\r
+--add\r
+</dt>\r
+<dd>\r
+<p>\r
+        Adds a new line to the option without altering any existing\r
+        values.  This is the same as providing <em>^$</em> as the value_regex.\r
+</p>\r
+</dd>\r
+<dt>\r
 --get\r
 </dt>\r
 <dd>\r
@@ -539,6 +550,11 @@ i.e. the one without a "for &#8230;" postfix, do something like this:</p>
 <div class="content">\r
 <pre><tt>% git repo-config section.key value '[!]'</tt></pre>\r
 </div></div>\r
+<p>To add a new proxy, without altering any of the existing ones, use</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>% git repo-config core.gitproxy '"proxy" for example.com'</tt></pre>\r
+</div></div>\r
 </div>\r
 <h2>CONFIGURATION FILE</h2>\r
 <div class="sectionbody">\r
@@ -643,8 +659,13 @@ core.logAllRefUpdates
 <div class="literalblock">\r
 <div class="content">\r
 <pre><tt>This information can be used to determine what commit\r
-was the tip of a branch "2 days ago".  This value is\r
-false by default (no automated creation of log files).</tt></pre>\r
+was the tip of a branch "2 days ago".</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>This value is true by default in a repository that has\r
+a working directory associated with it, and false by\r
+default in a bare repository.</tt></pre>\r
 </div></div>\r
 </dd>\r
 <dt>\r
@@ -800,8 +821,8 @@ color.status.&lt;slot&gt;
 <p>\r
         Use customized color for status colorization. <tt>&lt;slot&gt;</tt> is\r
         one of <tt>header</tt> (the header text of the status message),\r
-        <tt>updated</tt> (files which are updated but not committed),\r
-        <tt>changed</tt> (files which are changed but not updated in the index),\r
+        <tt>added</tt> or <tt>updated</tt> (files which are added but not committed),\r
+        <tt>changed</tt> (files which are changed but not added in the index),\r
         or <tt>untracked</tt> (files which are not tracked by git). The values of\r
         these variables may be specified as in color.diff.&lt;slot&gt;.\r
 </p>\r
@@ -1140,7 +1161,7 @@ receive.denyNonFastForwards
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2006 21:32:06 UTC\r
+Last updated 16-Dec-2006 07:43:51 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.txt b/git-repo-config.txt
index 5bede9a..b379ec5 100644 (file)
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-repo-config' [--global] [type] name [value [value_regex]]
+'git-repo-config' [--global] [type] --add name value
 'git-repo-config' [--global] [type] --replace-all name [value [value_regex]]
 'git-repo-config' [--global] [type] --get name [value_regex]
 'git-repo-config' [--global] [type] --get-all name [value_regex]
@@ -23,7 +24,8 @@ You can query/set/replace/unset options with this command. The name is
 actually the section and the key separated by a dot, and the value will be
 escaped.
 
-If you want to set/unset an option which can occur on multiple
+Multiple lines can be added to an option by using the '--add' option.
+If you want to update or unset an option which can occur on multiple
 lines, a POSIX regexp `value_regex` needs to be given.  Only the
 existing values that match the regexp are updated or unset.  If
 you want to handle the lines that do *not* match the regex, just
@@ -53,6 +55,10 @@ OPTIONS
        Default behavior is to replace at most one line. This replaces
        all lines matching the key (and optionally the value_regex).
 
+--add::
+       Adds a new line to the option without altering any existing
+       values.  This is the same as providing '^$' as the value_regex.
+
 --get::
        Get the value for a given key (optionally filtered by a regex
        matching the value). Returns error code 1 if the key was not
@@ -194,6 +200,12 @@ To actually match only values with an exclamation mark, you have to
 % git repo-config section.key value '[!]'
 ------------
 
+To add a new proxy, without altering any of the existing ones, use
+
+------------
+% git repo-config core.gitproxy '"proxy" for example.com'
+------------
+
 
 include::config.txt[]
 

diff --git a/git-reset.html b/git-reset.html
index 2fbdefa..d9a2baa 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -304,7 +304,7 @@ the undo in the history.</p>
 <p>\r
         Does not touch the index file nor the working tree at all, but\r
         requires them to be in a good order. This leaves all your changed\r
-        files "Updated but not checked in", as <a href="git-status.html">git-status(1)</a> would\r
+        files "Added but not yet committed", as <a href="git-status.html">git-status(1)</a> would\r
         put it.\r
 </p>\r
 </dd>\r
@@ -566,7 +566,7 @@ At this point the index file still has all the WIP changes you
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:24 UTC\r
+Last updated 16-Dec-2006 07:43:52 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.txt b/git-reset.txt
index 73a0ffc..4a4ceb6 100644 (file)
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -31,7 +31,7 @@ OPTIONS
 --soft::
        Does not touch the index file nor the working tree at all, but
        requires them to be in a good order. This leaves all your changed
-       files "Updated but not checked in", as gitlink:git-status[1] would
+       files "Added but not yet committed", as gitlink:git-status[1] would
        put it.
 
 --hard::

diff --git a/git-show.html b/git-show.html
index 7822cc2..d02b8a7 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -266,21 +266,24 @@ git-show(1) Manual Page
 <h2>NAME</h2>\r
 <div class="sectionbody">\r
 <p>git-show -\r
-   Show one commit with difference it introduces\r
+   Show various types of objects\r
 </p>\r
 </div>\r
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-show</em> &lt;option&gt;&#8230;</p>\r
+<p><em>git-show</em> [options] &lt;object&gt;&#8230;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
-<p>Shows commit log and textual diff for a single commit.  The\r
-command internally invokes <em>git-rev-list</em> piped to\r
-<em>git-diff-tree</em>, and takes command line options for both of\r
-these commands. It also presents the merge commit in a special\r
-format as produced by <em>git-diff-tree --cc</em>.</p>\r
+<p>Shows one or more objects (blobs, trees, tags and commits).</p>\r
+<p>For commits it shows the log message and textual diff. It also\r
+presents the merge commit in a special format as produced by\r
+<em>git-diff-tree --cc</em>.</p>\r
+<p>For tags, it shows the tag message and the referenced objects.</p>\r
+<p>For trees, it shows the names (equivalent to <a href="git-ls-tree.html">git-ls-tree(1)</a>\r
+with --name-only).</p>\r
+<p>For plain blobs, it shows the plain contents.</p>\r
 <p>This manual page describes only the most frequently used options.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
@@ -426,6 +429,34 @@ simplification into account.</p>
 </dd>\r
 </dl>\r
 </div>\r
+<h2>EXAMPLES</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+git show v1.0.0\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shows the tag <tt>v1.0.0</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
+\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shows the tree pointed to by the tag <tt>v1.0.0</tt>.\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>git show next~10:Documentation/README\r
+        Shows the contents of the file <tt>Documentation/README</tt> as\r
+        they were current in the 10th last commit of the branch\r
+        <tt>next</tt>.</p>\r
+<p>git show master:Makefile master:t/Makefile\r
+        Concatenates the contents of said Makefiles in the head\r
+        of the branch <tt>master</tt>.</p>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt; and\r
@@ -442,7 +473,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Nov-2006 02:47:22 UTC\r
+Last updated 16-Dec-2006 07:43:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.txt b/git-show.txt
index 4c880a8..98dea61 100644 (file)
--- a/git-show.txt
+++ b/git-show.txt
@@ -3,20 +3,27 @@ git-show(1)
 
 NAME
 ----
-git-show - Show one commit with difference it introduces
+git-show - Show various types of objects
 
 
 SYNOPSIS
 --------
-'git-show' <option>...
+'git-show' [options] <object>...
 
 DESCRIPTION
 -----------
-Shows commit log and textual diff for a single commit.  The
-command internally invokes 'git-rev-list' piped to
-'git-diff-tree', and takes command line options for both of
-these commands. It also presents the merge commit in a special
-format as produced by 'git-diff-tree --cc'.
+Shows one or more objects (blobs, trees, tags and commits).
+
+For commits it shows the log message and textual diff. It also
+presents the merge commit in a special format as produced by
+'git-diff-tree --cc'.
+
+For tags, it shows the tag message and the referenced objects.
+
+For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
+with \--name-only).
+
+For plain blobs, it shows the plain contents.
 
 This manual page describes only the most frequently used options.
 
@@ -28,6 +35,25 @@ OPTIONS
 
 include::pretty-formats.txt[]
 
+
+EXAMPLES
+--------
+
+git show v1.0.0::
+       Shows the tag `v1.0.0`.
+
+git show v1.0.0^{tree}::
+       Shows the tree pointed to by the tag `v1.0.0`.
+
+git show next~10:Documentation/README
+       Shows the contents of the file `Documentation/README` as
+       they were current in the 10th last commit of the branch
+       `next`.
+
+git show master:Makefile master:t/Makefile
+       Concatenates the contents of said Makefiles in the head
+       of the branch `master`.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and

diff --git a/tutorial-2.html b/tutorial-2.html
index c954b77..a18536c 100644 (file)
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -279,17 +279,17 @@ of the git documentation.</p>
 <pre><tt>$ mkdir test-project\r
 $ cd test-project\r
 $ git init-db\r
-defaulting to local storage area\r
+Initialized empty Git repository in .git/\r
 $ echo 'hello world' &gt; file.txt\r
 $ git add .\r
 $ git commit -a -m "initial commit"\r
-Committing initial tree 92b8b694ffb1675e5975148e1121810081dbdffe\r
+Created initial commit 54196cc2703dc165cbd373a65a4dcf22d50ae7f7\r
  create mode 100644 file.txt\r
 $ echo 'hello world!' &gt;file.txt\r
-$ git commit -a -m "add emphasis"</tt></pre>\r
+$ git commit -a -m "add emphasis"\r
+Created commit c4d59f390b9cfd4318117afde11d601c1085f241</tt></pre>\r
 </div></div>\r
-<p>What are the 40 digits of hex that git responded to the first commit\r
-with?</p>\r
+<p>What are the 40 digits of hex that git responded to the commit with?</p>\r
 <p>We saw in part one of the tutorial that commits have names like this.\r
 It turns out that every object in the git history is stored under\r
 such a 40-digit hex name.  That name is the SHA1 hash of the object's\r
@@ -297,13 +297,24 @@ contents; among other things, this ensures that git will never store
 the same data twice (since identical data is given an identical SHA1\r
 name), and that the contents of a git object will never change (since\r
 that would change the object's name as well).</p>\r
+<p>It is expected that the content of the commit object you created while\r
+following the example above generates a different SHA1 hash than\r
+the one shown above because the commit object records the time when\r
+it was created and the name of the person performing the commit.</p>\r
 <p>We can ask git about this particular object with the cat-file\r
-command&#8212;just cut-and-paste from the reply to the initial commit, to\r
-save yourself typing all 40 hex digits:</p>\r
+command. Don't copy the 40 hex digits from this example but use those\r
+from your own version. Note that you can shorten it to only a few\r
+characters to save yourself typing all 40 hex digits:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git cat-file -t 92b8b694ffb1675e5975148e1121810081dbdffe\r
-tree</tt></pre>\r
+<pre><tt>$ git-cat-file -t 54196cc2\r
+commit\r
+$ git-cat-file commit 54196cc2\r
+tree 92b8b694ffb1675e5975148e1121810081dbdffe\r
+author J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500\r
+committer J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500\r
+\r
+initial commit</tt></pre>\r
 </div></div>\r
 <p>A tree can refer to one or more "blob" objects, each corresponding to\r
 a file.  In addition, a tree can also refer to other tree objects,\r
@@ -354,8 +365,7 @@ directory:</p>
 </div></div>\r
 <p>and the contents of these files is just the compressed data plus a\r
 header identifying their length and their type.  The type is either a\r
-blob, a tree, a commit, or a tag.  We've seen a blob and a tree now,\r
-so next we should look at a commit.</p>\r
+blob, a tree, a commit, or a tag.</p>\r
 <p>The simplest commit to find is the HEAD commit, which we can find\r
 from .git/HEAD:</p>\r
 <div class="listingblock">\r
@@ -591,22 +601,22 @@ situation:</p>
 <div class="content">\r
 <pre><tt>$ git status\r
 #\r
-# Updated but not checked in:\r
+# Added but not yet committed:\r
 #   (will commit)\r
 #\r
 #       new file: closing.txt\r
 #\r
 #\r
-# Changed but not updated:\r
-#   (use git-update-index to mark for commit)\r
+# Changed but not added:\r
+#   (use "git add file1 file2" to include for commit)\r
 #\r
 #       modified: file.txt\r
 #</tt></pre>\r
 </div></div>\r
 <p>Since the current state of closing.txt is cached in the index file,\r
-it is listed as "updated but not checked in".  Since file.txt has\r
+it is listed as "added but not yet committed".  Since file.txt has\r
 changes in the working directory that aren't reflected in the index,\r
-it is marked "changed but not updated".  At this point, running "git\r
+it is marked "changed but not added".  At this point, running "git\r
 commit" would create a commit that added closing.txt (with its new\r
 contents), but that didn't modify file.txt.</p>\r
 <p>Also, note that a bare "git diff" shows the changes to file.txt, but\r
@@ -636,7 +646,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2006 21:32:09 UTC\r
+Last updated 16-Dec-2006 07:43:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.txt b/tutorial-2.txt
index 6389de5..60e5477 100644 (file)
--- a/tutorial-2.txt
+++ b/tutorial-2.txt
@@ -18,18 +18,18 @@ Let's start a new project and create a small amount of history:
 $ mkdir test-project
 $ cd test-project
 $ git init-db
-defaulting to local storage area
+Initialized empty Git repository in .git/
 $ echo 'hello world' > file.txt
 $ git add .
 $ git commit -a -m "initial commit"
-Committing initial tree 92b8b694ffb1675e5975148e1121810081dbdffe
+Created initial commit 54196cc2703dc165cbd373a65a4dcf22d50ae7f7
  create mode 100644 file.txt
 $ echo 'hello world!' >file.txt
 $ git commit -a -m "add emphasis"
+Created commit c4d59f390b9cfd4318117afde11d601c1085f241
 ------------------------------------------------
 
-What are the 40 digits of hex that git responded to the first commit
-with?
+What are the 40 digits of hex that git responded to the commit with?
 
 We saw in part one of the tutorial that commits have names like this.
 It turns out that every object in the git history is stored under
@@ -39,13 +39,25 @@ the same data twice (since identical data is given an identical SHA1
 name), and that the contents of a git object will never change (since
 that would change the object's name as well).
 
+It is expected that the content of the commit object you created while
+following the example above generates a different SHA1 hash than
+the one shown above because the commit object records the time when
+it was created and the name of the person performing the commit.
+
 We can ask git about this particular object with the cat-file
-command--just cut-and-paste from the reply to the initial commit, to
-save yourself typing all 40 hex digits:
+command. Don't copy the 40 hex digits from this example but use those
+from your own version. Note that you can shorten it to only a few
+characters to save yourself typing all 40 hex digits:
 
 ------------------------------------------------
-$ git cat-file -t 92b8b694ffb1675e5975148e1121810081dbdffe
-tree
+$ git-cat-file -t 54196cc2
+commit
+$ git-cat-file commit 54196cc2
+tree 92b8b694ffb1675e5975148e1121810081dbdffe
+author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
+committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
+
+initial commit
 ------------------------------------------------
 
 A tree can refer to one or more "blob" objects, each corresponding to
@@ -102,8 +114,7 @@ $ find .git/objects/
 
 and the contents of these files is just the compressed data plus a
 header identifying their length and their type.  The type is either a
-blob, a tree, a commit, or a tag.  We've seen a blob and a tree now,
-so next we should look at a commit.
+blob, a tree, a commit, or a tag.
 
 The simplest commit to find is the HEAD commit, which we can find
 from .git/HEAD:
@@ -342,23 +353,23 @@ situation:
 ------------------------------------------------
 $ git status
 #
-# Updated but not checked in:
+# Added but not yet committed:
 #   (will commit)
 #
 #       new file: closing.txt
 #
 #
-# Changed but not updated:
-#   (use git-update-index to mark for commit)
+# Changed but not added:
+#   (use "git add file1 file2" to include for commit)
 #
 #       modified: file.txt
 #
 ------------------------------------------------
 
 Since the current state of closing.txt is cached in the index file,
-it is listed as "updated but not checked in".  Since file.txt has
+it is listed as "added but not yet committed".  Since file.txt has
 changes in the working directory that aren't reflected in the index,
-it is marked "changed but not updated".  At this point, running "git
+it is marked "changed but not added".  At this point, running "git
 commit" would create a commit that added closing.txt (with its new
 contents), but that didn't modify file.txt.
 

diff --git a/tutorial.html b/tutorial.html
index 5a7fa51..ddb2dcd 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -296,7 +296,7 @@ $ git init-db</tt></pre>
 <p>Git will reply</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>defaulting to local storage area</tt></pre>\r
+<pre><tt>Initialized empty Git repository in .git/</tt></pre>\r
 </div></div>\r
 <p>You've now initialized the working directory&#8212;you may notice a new\r
 directory created, named ".git".  Tell git that you want it to track\r
@@ -762,7 +762,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2006 21:32:08 UTC\r
+Last updated 16-Dec-2006 07:43:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.txt b/tutorial.txt
index 02dede3..cb808d9 100644 (file)
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -38,7 +38,7 @@ $ git init-db
 Git will reply
 
 ------------------------------------------------
-defaulting to local storage area
+Initialized empty Git repository in .git/
 ------------------------------------------------
 
 You've now initialized the working directory--you may notice a new