Autogenerated HTML docs for v1.4.0-rc1-gfd7e

diff --git a/config.txt b/config.txt
index c861c6c..570b691 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -91,6 +91,14 @@ core.warnAmbiguousRefs::
        If true, git will warn you if the ref name you passed it is ambiguous
        and might match multiple refs in the .git/refs/ tree. True by default.
 
        If true, git will warn you if the ref name you passed it is ambiguous
        and might match multiple refs in the .git/refs/ tree. True by default.
 

+alias.*::
+       Command aliases for the gitlink:git[1] command wrapper - e.g.
+       after defining "alias.last = cat-file commit HEAD", the invocation
+       "git last" is equivalent to "git cat-file commit HEAD". To avoid
+       confusion, aliases that hide existing git commands are ignored.
+       Arguments are split at whitespaces, but single or double
+       quote pair can be used to quote them.
+

 apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].


@@ -113,12 +121,12 @@ gitcvs.logfile::
 
 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
 
 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing

-       over HTTPS. Can be overriden by the 'GIT_SSL_NO_VERIFY' environment
+       over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment

        variable.
 
 http.sslCert::
        File containing the SSL certificate when fetching or pushing
        variable.
 
 http.sslCert::
        File containing the SSL certificate when fetching or pushing

-       over HTTPS. Can be overriden by the 'GIT_SSL_CERT' environment
+       over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment

        variable.
 
 http.sslKey::
        variable.
 
 http.sslKey::


@@ -133,7 +141,7 @@ http.sslCAInfo::
 
 http.sslCAPath::
        Path containing files with the CA certificates to verify the peer
 
 http.sslCAPath::
        Path containing files with the CA certificates to verify the peer

-       with when fetching or pushing over HTTPS. Can be overriden
+       with when fetching or pushing over HTTPS. Can be overridden

        by the 'GIT_SSL_CAPATH' environment variable.
 
 http.maxRequests::
        by the 'GIT_SSL_CAPATH' environment variable.
 
 http.maxRequests::

diff --git a/cvs-migration.html b/cvs-migration.html
index 1ff9c4e..63e5d1e 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -368,7 +368,7 @@ $ GIT_DIR=repo.git git repo-config core.sharedrepository true</tt></pre>
 <p>Make sure committers have a umask of at most 027, so that the directories\r
 they create are writable and searchable by other group members.</p>\r
 <p>Suppose this repository is now set up in /pub/repo.git on the host\r
 <p>Make sure committers have a umask of at most 027, so that the directories\r
 they create are writable and searchable by other group members.</p>\r
 <p>Suppose this repository is now set up in /pub/repo.git on the host\r

-foo.com.  Then as an individual commiter you can clone the shared\r
+foo.com.  Then as an individual committer you can clone the shared\r

 repository:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
 repository:</p>\r
 <div class="listingblock">\r
 <div class="content">\r


@@ -579,7 +579,7 @@ that contain this changed "if" statement:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:38 UTC\r
+Last updated 07-Jun-2006 19:51:36 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.txt b/cvs-migration.txt
index 826d089..1fbca83 100644 (file)
--- a/cvs-migration.txt
+++ b/cvs-migration.txt
@@ -106,7 +106,7 @@ Make sure committers have a umask of at most 027, so that the directories
 they create are writable and searchable by other group members.
 
 Suppose this repository is now set up in /pub/repo.git on the host
 they create are writable and searchable by other group members.
 
 Suppose this repository is now set up in /pub/repo.git on the host

-foo.com.  Then as an individual commiter you can clone the shared
+foo.com.  Then as an individual committer you can clone the shared

 repository:
 
 ------------------------------------------------
 repository:
 
 ------------------------------------------------

diff --git a/everyday.html b/everyday.html
index 93b5617..012a947 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -308,7 +308,7 @@ repositories to support developers.</p>
 </li>\r
 <li>\r
 <p>\r
 </li>\r
 <li>\r
 <p>\r

-<a href="git-prune.html">git-prune(1)</a> to garbage collect crufts in the\r
+<a href="git-prune.html">git-prune(1)</a> to garbage collect cruft in the\r

     repository.\r
 </p>\r
 </li>\r
     repository.\r
 </p>\r
 </li>\r


@@ -1067,7 +1067,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 06-Jun-2006 01:23:29 UTC\r
+Last updated 07-Jun-2006 19:51:36 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/everyday.txt b/everyday.txt
index 6745ab5..b935c18 100644 (file)
--- a/everyday.txt
+++ b/everyday.txt
@@ -45,7 +45,7 @@ Everybody uses these commands to feed and care git repositories.
 
   * gitlink:git-fsck-objects[1] to validate the repository.
 
 
   * gitlink:git-fsck-objects[1] to validate the repository.
 

-  * gitlink:git-prune[1] to garbage collect crufts in the
+  * gitlink:git-prune[1] to garbage collect cruft in the

     repository.
 
   * gitlink:git-repack[1] to pack loose objects for efficiency.
     repository.
 
   * gitlink:git-repack[1] to pack loose objects for efficiency.

diff --git a/git-apply.html b/git-apply.html
index ff6beff..bbfb9dc 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -390,7 +390,7 @@ and a work tree.</p>
 <p>\r
         Ensure at least &lt;n&gt; lines of surrounding context match before\r
         and after each change.  When fewer lines of surrounding\r
 <p>\r
         Ensure at least &lt;n&gt; lines of surrounding context match before\r
         and after each change.  When fewer lines of surrounding\r

-        context exist they all most match.  By default no context is\r
+        context exist they all must match.  By default no context is\r

         ever ignored.\r
 </p>\r
 </dd>\r
         ever ignored.\r
 </p>\r
 </dd>\r


@@ -510,7 +510,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:20 UTC\r
+Last updated 07-Jun-2006 19:51:29 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index 9cc7c74..2ff7494 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -76,7 +76,7 @@ OPTIONS
 -C<n>::
        Ensure at least <n> lines of surrounding context match before
        and after each change.  When fewer lines of surrounding
 -C<n>::
        Ensure at least <n> lines of surrounding context match before
        and after each change.  When fewer lines of surrounding

-       context exist they all most match.  By default no context is
+       context exist they all must match.  By default no context is

        ever ignored.
 
 --apply::
        ever ignored.
 
 --apply::

diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index 8e55564..89d4430 100644 (file)
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -285,8 +285,9 @@ imposes the following rules on how refs are named:</p>
 <ol>\r
 <li>\r
 <p>\r
 <ol>\r
 <li>\r
 <p>\r

-It could be named hierarchically (i.e. separated with slash\r
-  <tt>/</tt>), but each of its component cannot begin with a dot <tt>.</tt>;\r
+It can include slash <tt>/</tt> for hierarchical (directory)\r
+  grouping, but no slash-separated component can begin with a\r
+  dot <tt>.</tt>;\r

 </p>\r
 </li>\r
 <li>\r
 </p>\r
 </li>\r
 <li>\r


@@ -342,7 +343,7 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 21-May-2006 10:50:04 UTC\r
+Last updated 07-Jun-2006 19:51:29 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt
index 3ea720d..13a5f43 100644 (file)
--- a/git-check-ref-format.txt
+++ b/git-check-ref-format.txt
@@ -19,8 +19,9 @@ branch head is stored under `$GIT_DIR/refs/heads` directory, and
 a tag is stored under `$GIT_DIR/refs/tags` directory.  git
 imposes the following rules on how refs are named:
 
 a tag is stored under `$GIT_DIR/refs/tags` directory.  git
 imposes the following rules on how refs are named:
 

-. It could be named hierarchically (i.e. separated with slash
-  `/`), but each of its component cannot begin with a dot `.`;
+. It can include slash `/` for hierarchical (directory)
+  grouping, but no slash-separated component can begin with a
+  dot `.`;

 
 . It cannot have two consecutive dots `..` anywhere;
 
 
 . It cannot have two consecutive dots `..` anywhere;
 

diff --git a/git-describe.html b/git-describe.html
index 3395f88..0b9589b 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -289,7 +289,7 @@ object name of the commit.</p>
 </dt>\r
 <dd>\r
 <p>\r
 </dt>\r
 <dd>\r
 <p>\r

-        The object name of the comittish.\r
+        The object name of the committish.\r

 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r


@@ -367,7 +367,7 @@ butchered by Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 10-Mar-2006 00:31:24 UTC\r
+Last updated 07-Jun-2006 19:51:29 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.txt b/git-describe.txt
index 7a253ea..2700f35 100644 (file)
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -21,7 +21,7 @@ object name of the commit.
 OPTIONS
 -------
 <committish>::
 OPTIONS
 -------
 <committish>::

-       The object name of the comittish. 
+       The object name of the committish.

 
 --all::
        Instead of using only the annotated tags, use any ref
 
 --all::
        Instead of using only the annotated tags, use any ref

diff --git a/git-ls-tree.html b/git-ls-tree.html
index 94a71b3..caf41d2 100644 (file)
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -272,9 +272,10 @@ git-ls-tree(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r

-<p><em>git-ls-tree</em> [-d] [-r] [-t] [-z]\r
-        [--name-only] [--name-status] [--full-name] [--abbrev=[&lt;n&gt;]]\r
-        &lt;tree-ish&gt; [paths&#8230;]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-ls-tree</em> [-d] [-r] [-t] [-z]\r
+            [--name-only] [--name-status] [--full-name] [--abbrev=[&lt;n&gt;]]\r
+            &lt;tree-ish&gt; [paths&#8230;]</div></div>\r

 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r


@@ -350,6 +351,15 @@ arguments does not matter.</p>
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

+--full-name\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the path names relative the current working\r
+        directory, show the full path names.\r
+</p>\r
+</dd>\r
+<dt>\r

 paths\r
 </dt>\r
 <dd>\r
 paths\r
 </dt>\r
 <dd>\r


@@ -380,7 +390,6 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 <div class="sectionbody">\r
 <p>Documentation by David Greaves, Junio C Hamano and the git-list\r
 &lt;git@vger.kernel.org&gt;.</p>\r
 <div class="sectionbody">\r
 <p>Documentation by David Greaves, Junio C Hamano and the git-list\r
 &lt;git@vger.kernel.org&gt;.</p>\r

-<p>This manual page is a stub. You can help the git documentation by expanding it.</p>\r

 </div>\r
 <h2>GIT</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>GIT</h2>\r
 <div class="sectionbody">\r


@@ -388,7 +397,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 28-Mar-2006 00:27:56 UTC\r
+Last updated 07-Jun-2006 19:51:30 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-tree.txt b/git-ls-tree.txt
index 018c401..7e072b5 100644 (file)
--- a/git-ls-tree.txt
+++ b/git-ls-tree.txt
@@ -8,9 +8,10 @@ git-ls-tree - Lists the contents of a tree object
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

+[verse]

 'git-ls-tree' [-d] [-r] [-t] [-z]
 'git-ls-tree' [-d] [-r] [-t] [-z]

-       [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
-       <tree-ish> [paths...]
+           [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
+           <tree-ish> [paths...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -47,6 +48,10 @@ OPTIONS
        lines, show only handful hexdigits prefix.
        Non default number of digits can be specified with --abbrev=<n>.
 
        lines, show only handful hexdigits prefix.
        Non default number of digits can be specified with --abbrev=<n>.
 

+--full-name::
+       Instead of showing the path names relative the current working
+       directory, show the full path names.
+

 paths::
        When paths are given, show them (note that this isn't really raw
        pathnames, but rather a list of patterns to match).  Otherwise
 paths::
        When paths are given, show them (note that this isn't really raw
        pathnames, but rather a list of patterns to match).  Otherwise


@@ -72,8 +77,6 @@ Documentation
 Documentation by David Greaves, Junio C Hamano and the git-list
 <git@vger.kernel.org>.
 
 Documentation by David Greaves, Junio C Hamano and the git-list
 <git@vger.kernel.org>.
 

-This manual page is a stub. You can help the git documentation by expanding it.
-

 GIT
 ---
 Part of the gitlink:git[7] suite
 GIT
 ---
 Part of the gitlink:git[7] suite

diff --git a/git-name-rev.html b/git-name-rev.html
index 7ea2e87..4976fb5 100644 (file)
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -272,7 +272,7 @@ git-name-rev(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r

-<p><em>git-name-rev</em> [--tags] ( --all | --stdin | &lt;commitish&gt;&#8230; )</p>\r
+<p><em>git-name-rev</em> [--tags] ( --all | --stdin | &lt;committish&gt;&#8230; )</p>\r

 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r


@@ -342,7 +342,7 @@ not the context.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 05-May-2006 23:14:14 UTC\r
+Last updated 07-Jun-2006 19:51:30 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-name-rev.txt b/git-name-rev.txt
index ffaa004..39a1434 100644 (file)
--- a/git-name-rev.txt
+++ b/git-name-rev.txt
@@ -8,7 +8,7 @@ git-name-rev - Find symbolic names for given revs
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-name-rev' [--tags] ( --all | --stdin | <commitish>... )
+'git-name-rev' [--tags] ( --all | --stdin | <committish>... )

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

diff --git a/git-p4import.html b/git-p4import.html
index 1150438..cd9e75a 100644 (file)
--- a/git-p4import.html
+++ b/git-p4import.html
@@ -421,7 +421,7 @@ the Perforce repository where xx is the Perforce changeset number.
 Therefore after the import you can use git to access any commit by its\r
 Perforce number, eg. git show p4/327.</p>\r
 <p>The tag associated with the HEAD commit is also how <tt>git-p4import</tt>\r
 Therefore after the import you can use git to access any commit by its\r
 Perforce number, eg. git show p4/327.</p>\r
 <p>The tag associated with the HEAD commit is also how <tt>git-p4import</tt>\r

-determines if their are new changes to incrementally import from the\r
+determines if there are new changes to incrementally import from the\r

 Perforce repository.</p>\r
 <p>If you import from a repository with many thousands of changes\r
 you will have an equal number of p4/xxxx git tags.  Git tags can\r
 Perforce repository.</p>\r
 <p>If you import from a repository with many thousands of changes\r
 you will have an equal number of p4/xxxx git tags.  Git tags can\r


@@ -453,7 +453,7 @@ of mappings with each line containing one mapping in the format:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 06-Jun-2006 05:43:53 UTC\r
+Last updated 07-Jun-2006 19:51:30 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-p4import.txt b/git-p4import.txt
index b8ff1e9..c198ff2 100644 (file)
--- a/git-p4import.txt
+++ b/git-p4import.txt
@@ -128,7 +128,7 @@ Therefore after the import you can use git to access any commit by its
 Perforce number, eg. git show p4/327.
 
 The tag associated with the HEAD commit is also how `git-p4import`
 Perforce number, eg. git show p4/327.
 
 The tag associated with the HEAD commit is also how `git-p4import`

-determines if their are new changes to incrementally import from the
+determines if there are new changes to incrementally import from the

 Perforce repository.
 
 If you import from a repository with many thousands of changes
 Perforce repository.
 
 If you import from a repository with many thousands of changes

diff --git a/git-read-tree.html b/git-read-tree.html
index d159a4c..5edf6e3 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -590,7 +590,7 @@ file that does not match stage 2.</p>
 <p>This is done to prevent you from losing your work-in-progress\r
 changes, and mixing your random changes in an unrelated merge\r
 commit.  To illustrate, suppose you start from what has been\r
 <p>This is done to prevent you from losing your work-in-progress\r
 changes, and mixing your random changes in an unrelated merge\r
 commit.  To illustrate, suppose you start from what has been\r

-commited last to your repository:</p>\r
+committed last to your repository:</p>\r

 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>$ JC=`git-rev-parse --verify "HEAD^0"`\r
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>$ JC=`git-rev-parse --verify "HEAD^0"`\r


@@ -649,7 +649,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:29 UTC\r
+Last updated 07-Jun-2006 19:51:31 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-read-tree.txt b/git-read-tree.txt
index 02c7e99..d894f53 100644 (file)
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -257,7 +257,7 @@ file that does not match stage 2.
 This is done to prevent you from losing your work-in-progress
 changes, and mixing your random changes in an unrelated merge
 commit.  To illustrate, suppose you start from what has been
 This is done to prevent you from losing your work-in-progress
 changes, and mixing your random changes in an unrelated merge
 commit.  To illustrate, suppose you start from what has been

-commited last to your repository:
+committed last to your repository:

 
 ----------------
 $ JC=`git-rev-parse --verify "HEAD^0"`
 
 ----------------
 $ JC=`git-rev-parse --verify "HEAD^0"`

diff --git a/git-repo-config.html b/git-repo-config.html
index c95eef1..2d69a87 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -619,6 +619,19 @@ core.warnAmbiguousRefs
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

+alias.*\r
+</dt>\r
+<dd>\r
+<p>\r
+        Command aliases for the <a href="git.html">git(1)</a> command wrapper - e.g.\r
+        after defining "alias.last = cat-file commit HEAD", the invocation\r
+        "git last" is equivalent to "git cat-file commit HEAD". To avoid\r
+        confusion, aliases that hide existing git commands are ignored.\r
+        Arguments are split at whitespaces, but single or double\r
+        quote pair can be used to quote them.\r
+</p>\r
+</dd>\r
+<dt>\r

 apply.whitespace\r
 </dt>\r
 <dd>\r
 apply.whitespace\r
 </dt>\r
 <dd>\r


@@ -669,7 +682,7 @@ http.sslVerify
 <dd>\r
 <p>\r
         Whether to verify the SSL certificate when fetching or pushing\r
 <dd>\r
 <p>\r
         Whether to verify the SSL certificate when fetching or pushing\r

-        over HTTPS. Can be overriden by the <em>GIT_SSL_NO_VERIFY</em> environment\r
+        over HTTPS. Can be overridden by the <em>GIT_SSL_NO_VERIFY</em> environment\r

         variable.\r
 </p>\r
 </dd>\r
         variable.\r
 </p>\r
 </dd>\r


@@ -679,7 +692,7 @@ http.sslCert
 <dd>\r
 <p>\r
         File containing the SSL certificate when fetching or pushing\r
 <dd>\r
 <p>\r
         File containing the SSL certificate when fetching or pushing\r

-        over HTTPS. Can be overriden by the <em>GIT_SSL_CERT</em> environment\r
+        over HTTPS. Can be overridden by the <em>GIT_SSL_CERT</em> environment\r

         variable.\r
 </p>\r
 </dd>\r
         variable.\r
 </p>\r
 </dd>\r


@@ -709,7 +722,7 @@ http.sslCAPath
 <dd>\r
 <p>\r
         Path containing files with the CA certificates to verify the peer\r
 <dd>\r
 <p>\r
         Path containing files with the CA certificates to verify the peer\r

-        with when fetching or pushing over HTTPS. Can be overriden\r
+        with when fetching or pushing over HTTPS. Can be overridden\r

         by the <em>GIT_SSL_CAPATH</em> environment variable.\r
 </p>\r
 </dd>\r
         by the <em>GIT_SSL_CAPATH</em> environment variable.\r
 </p>\r
 </dd>\r


@@ -843,7 +856,7 @@ imap
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:29 UTC\r
+Last updated 07-Jun-2006 19:51:31 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.html b/git-shortlog.html
index 4267633..41b397c 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -277,7 +277,31 @@ git-shortlog(1) Manual Page
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 <p>Summarizes <em>git log</em> output in a format suitable for inclusion\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 <p>Summarizes <em>git log</em> output in a format suitable for inclusion\r

-in release announcements.</p>\r
+in release announcements. Each commit will be grouped by author\r
+the first line of the commit message will be shown.</p>\r
+<p>Additionally, "[PATCH]" will be stripped from the commit description.</p>\r
+</div>\r
+<h2>FILES</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+<em>.mailmap</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        If this file exists, it will be used for mapping author email\r
+        addresses to a real author name. One mapping per line, first\r
+        the author name followed by the email address enclosed by\r
+        <em>&lt;</em> and <em>&gt;</em>. Use hash <em>#</em> for comments. Example:\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt># Keep alphabetized\r
+Adam Morrow &lt;adam@localhost.localdomain&gt;\r
+Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>\r
+</div></div>\r
+</dd>\r
+</dl>\r

 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r


@@ -293,7 +317,7 @@ in release announcements.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 10-Mar-2006 00:31:36 UTC\r
+Last updated 07-Jun-2006 19:51:32 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.txt b/git-shortlog.txt
index 54fb922..7486ebe 100644 (file)
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -5,7 +5,6 @@ NAME
 ----
 git-shortlog - Summarize 'git log' output
 
 ----
 git-shortlog - Summarize 'git log' output
 

-

 SYNOPSIS
 --------
 git-log --pretty=short | 'git-shortlog'
 SYNOPSIS
 --------
 git-log --pretty=short | 'git-shortlog'


@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'
 DESCRIPTION
 -----------
 Summarizes 'git log' output in a format suitable for inclusion
 DESCRIPTION
 -----------
 Summarizes 'git log' output in a format suitable for inclusion

-in release announcements.
-
+in release announcements. Each commit will be grouped by author
+the first line of the commit message will be shown.
+
+Additionally, "[PATCH]" will be stripped from the commit description.
+
+FILES
+-----
+'.mailmap'::
+       If this file exists, it will be used for mapping author email
+       addresses to a real author name. One mapping per line, first
+       the author name followed by the email address enclosed by
+       '<' and '>'. Use hash '#' for comments. Example:
+
+               # Keep alphabetized
+               Adam Morrow <adam@localhost.localdomain>
+               Eve Jones <eve@laptop.(none)>

 
 Author
 ------
 
 Author
 ------

diff --git a/git-tar-tree.html b/git-tar-tree.html
index 26b84f6..0cecc68 100644 (file)
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
 <head>\r
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
 <head>\r
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r

-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r

 <style type="text/css">\r
 /* Debug borders */\r
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
 <style type="text/css">\r
 /* Debug borders */\r
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r


@@ -272,7 +272,7 @@ git-tar-tree(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r

-<p><em>git-tar-tree</em> &lt;tree-ish&gt; [ &lt;base&gt; ]</p>\r
+<p><em>git-tar-tree</em> [--remote=&lt;repo&gt;] &lt;tree-ish&gt; [ &lt;base&gt; ]</p>\r

 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r


@@ -286,6 +286,62 @@ commit time as recorded in the referenced commit object is used instead.
 Additionally the commit ID is stored in a global extended pax header.\r
 It can be extracted using git-get-tar-commit-id.</p>\r
 </div>\r
 Additionally the commit ID is stored in a global extended pax header.\r
 It can be extracted using git-get-tar-commit-id.</p>\r
 </div>\r

+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+&lt;tree-ish&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        The tree or commit to produce tar archive for.  If it is\r
+        the object name of a commit object.\r
+</p>\r
+</dd>\r
+<dt>\r
+&lt;base&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Leading path to the files in the resulting tar archive.\r
+</p>\r
+</dd>\r
+<dt>\r
+--remote=&lt;repo&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of making a tar archive from local repository,\r
+        retrieve a tar archive from a remote repository.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Examples</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+git tar-tree HEAD | (cd /var/tmp/ &amp;&amp; mkdir junk &amp;&amp; tar Cxf junk -)\r
+</dt>\r
+<dd>\r
+<p>\r
+        Create a tar archive that contains the contents of the\r
+        latest commit on the current branch, and extracts it in\r
+        <tt>/var/tmp/junk</tt> directory.\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>git tar-tree v2.6.17 linux-2.6.17 | gzip &gt;linux-2.6.17.tar.gz</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>Create a tarball for v2.6.17 release.</tt></pre>\r
+</div></div>\r
+<p>git tar-tree --remote=example.com:git.git v0.99 &gt;git-0.99.tar</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>Get a tarball v0.99 from example.com.</tt></pre>\r
+</div></div>\r
+</div>\r

 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Rene Scharfe.</p>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Rene Scharfe.</p>\r


@@ -300,7 +356,7 @@ It can be extracted using git-get-tar-commit-id.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 27-Dec-2005 00:16:50 PDT\r
+Last updated 07-Jun-2006 19:51:32 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tar-tree.txt b/git-tar-tree.txt
index 2139b6f..831537b 100644 (file)
--- a/git-tar-tree.txt
+++ b/git-tar-tree.txt
@@ -8,7 +8,7 @@ git-tar-tree - Creates a tar archive of the files in the named tree
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-tar-tree' <tree-ish> [ <base> ]
+'git-tar-tree' [--remote=<repo>] <tree-ish> [ <base> ]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -23,6 +23,35 @@ commit time as recorded in the referenced commit object is used instead.
 Additionally the commit ID is stored in a global extended pax header.
 It can be extracted using git-get-tar-commit-id.
 
 Additionally the commit ID is stored in a global extended pax header.
 It can be extracted using git-get-tar-commit-id.
 

+OPTIONS
+-------
+
+<tree-ish>::
+       The tree or commit to produce tar archive for.  If it is
+       the object name of a commit object.
+
+<base>::
+       Leading path to the files in the resulting tar archive.
+
+--remote=<repo>::
+       Instead of making a tar archive from local repository,
+       retrieve a tar archive from a remote repository.
+
+Examples
+--------
+git tar-tree HEAD | (cd /var/tmp/ && mkdir junk && tar Cxf junk -)::
+
+       Create a tar archive that contains the contents of the
+       latest commit on the current branch, and extracts it in
+       `/var/tmp/junk` directory.
+
+git tar-tree v2.6.17 linux-2.6.17 | gzip >linux-2.6.17.tar.gz
+
+       Create a tarball for v2.6.17 release.
+
+git tar-tree --remote=example.com:git.git v0.99 >git-0.99.tar
+
+       Get a tarball v0.99 from example.com.

 
 Author
 ------
 
 Author
 ------

diff --git a/git-upload-tar.html b/git-upload-tar.html
new file mode 100644 (file)
index 0000000..7d51d26
--- /dev/null
+++ b/git-upload-tar.html
@@ -0,0 +1,317 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-upload-tar(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-upload-tar(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-upload-tar -\r
+   Send tar archive\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-upload-tar</em> &lt;directory&gt;</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Invoked by <em>git-tar-tree --remote</em> and sends a generated tar archive\r
+to the other end over the git protocol.</p>\r
+<p>This command is usually not invoked directly by the end user.\r
+The UI for the protocol is on the <em>git-tar-tree</em> side, and the\r
+program pair is meant to be used to get a tar achive from a\r
+remote repository.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+&lt;directory&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        The repository to get a tar archive from.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Junio C Hamano &lt;junio@kernel.org&gt;</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Junio C Hamano.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 07-Jun-2006 19:51:33 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/git-upload-tar.txt b/git-upload-tar.txt
new file mode 100644 (file)
index 0000000..a1019a0
--- /dev/null
+++ b/git-upload-tar.txt
@@ -0,0 +1,39 @@
+git-upload-tar(1)
+=================
+
+NAME
+----
+git-upload-tar - Send tar archive
+
+
+SYNOPSIS
+--------
+'git-upload-tar' <directory>
+
+DESCRIPTION
+-----------
+Invoked by 'git-tar-tree --remote' and sends a generated tar archive
+to the other end over the git protocol.
+
+This command is usually not invoked directly by the end user.
+The UI for the protocol is on the 'git-tar-tree' side, and the
+program pair is meant to be used to get a tar achive from a
+remote repository.
+
+
+OPTIONS
+-------
+<directory>::
+       The repository to get a tar archive from.
+
+Author
+------
+Written by Junio C Hamano <junio@kernel.org>
+
+Documentation
+--------------
+Documentation by Junio C Hamano.
+
+GIT
+---
+Part of the gitlink:git[7] suite

diff --git a/git.html b/git.html
index 7811ef0..6983749 100644 (file)
--- a/git.html
+++ b/git.html
@@ -283,6 +283,8 @@ and full access to internals.</p>
 <a href="everyday.html">Everyday Git</a> for a useful minimum set of commands, and\r
 "man git-commandname" for documentation of each command.  CVS users may\r
 also want to read <a href="cvs-migration.html">CVS migration</a>.</p>\r
 <a href="everyday.html">Everyday Git</a> for a useful minimum set of commands, and\r
 "man git-commandname" for documentation of each command.  CVS users may\r
 also want to read <a href="cvs-migration.html">CVS migration</a>.</p>\r

+<p>The COMMAND is either a name of a Git command (see below) or an alias\r
+as defined in the configuration file (see <a href="git-repo-config.html">git-repo-config(1)</a>).</p>\r

 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r


@@ -742,6 +744,15 @@ the working tree.</p>
         what are asked for.\r
 </p>\r
 </dd>\r
         what are asked for.\r
 </p>\r
 </dd>\r

+<dt>\r
+<a href="git-upload-tar.html">git-upload-tar(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Invoked by <em>git-tar-tree --remote</em> to return the tar\r
+        archive the other end asked for.\r
+</p>\r
+</dd>\r

 </dl>\r
 </div>\r
 <h2>High-level commands (porcelain)</h2>\r
 </dl>\r
 </div>\r
 <h2>High-level commands (porcelain)</h2>\r


@@ -1091,6 +1102,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

+<a href="git-quiltimport.html">git-quiltimport(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Applies a quilt patchset onto the current branch.\r
+</p>\r
+</dd>\r
+<dt>\r

 <a href="git-relink.html">git-relink(1)</a>\r
 </dt>\r
 <dd>\r
 <a href="git-relink.html">git-relink(1)</a>\r
 </dt>\r
 <dd>\r


@@ -2095,7 +2114,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 18-Apr-2006 21:30:44 UTC\r
+Last updated 07-Jun-2006 19:51:33 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 24ca55d..d4472b5 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -21,6 +21,9 @@ 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].
 
 "man git-commandname" for documentation of each command.  CVS users may
 also want to read link:cvs-migration.html[CVS migration].
 

+The COMMAND is either a name of a Git command (see below) or an alias
+as defined in the configuration file (see gitlink:git-repo-config[1]).
+

 OPTIONS
 -------
 --version::
 OPTIONS
 -------
 --version::


@@ -237,6 +240,10 @@ gitlink:git-upload-pack[1]::
        Invoked by 'git-clone-pack' and 'git-fetch-pack' to push
        what are asked for.
 
        Invoked by 'git-clone-pack' and 'git-fetch-pack' to push
        what are asked for.
 

+gitlink:git-upload-tar[1]::
+       Invoked by 'git-tar-tree --remote' to return the tar
+       archive the other end asked for.
+

 
 High-level commands (porcelain)
 -------------------------------
 
 High-level commands (porcelain)
 -------------------------------


@@ -378,6 +385,9 @@ gitlink:git-merge-one-file[1]::
 gitlink:git-prune[1]::
        Prunes all unreachable objects from the object database.
 
 gitlink:git-prune[1]::
        Prunes all unreachable objects from the object database.
 

+gitlink:git-quiltimport[1]::
+       Applies a quilt patchset onto the current branch.
+

 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 

diff --git a/glossary.html b/glossary.html
index 0c45a4f..303893e 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -497,6 +497,18 @@ div.exampleblock-content {
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

+<a id="ref_grafts"></a>grafts\r
+</dt>\r
+<dd>\r
+<p>\r
+        Grafts enables two otherwise different lines of development to be joined\r
+        together by recording fake ancestry information for commits. This way\r
+        you can make git pretend the set of parents a <a href="#ref_commit">commit</a> has\r
+        is different from what was recorded when the <a href="#ref_commit">commit</a> was\r
+        created. Configured via the <tt>.git/info/<a href="#ref_grafts">grafts</a></tt> file.\r
+</p>\r
+</dd>\r
+<dt>\r

 <a id="ref_hash"></a>hash\r
 </dt>\r
 <dd>\r
 <a id="ref_hash"></a>hash\r
 </dt>\r
 <dd>\r


@@ -938,7 +950,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-May-2006 08:01:37 UTC\r
+Last updated 07-Jun-2006 19:51:37 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.txt b/glossary.txt
index 39c90ad..116ddb7 100644 (file)
--- a/glossary.txt
+++ b/glossary.txt
@@ -109,6 +109,13 @@ file system::
 git archive::
        Synonym for repository (for arch people).
 
 git archive::
        Synonym for repository (for arch people).
 

+grafts::
+       Grafts enables two otherwise different lines of development to be
+       joined together by recording fake ancestry information for commits.
+       This way you can make git pretend the set of parents a commit
+       has is different from what was recorded when the commit was created.
+       Configured via the `.git/info/grafts` file.
+

 hash::
        In git's context, synonym to object name.
 
 hash::
        In git's context, synonym to object name.
 

diff --git a/hooks.html b/hooks.html
index 657211b..04f074c 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -345,7 +345,7 @@ send out a commit notification e-mail.</p>
 <p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
 which is happens when a <tt>git push</tt> is done on a local repository.\r
 Just before updating the ref on the remote repository, the update hook\r
 <p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
 which is happens when a <tt>git push</tt> is done on a local repository.\r
 Just before updating the ref on the remote repository, the update hook\r

-is invoked.  It's exit status determines the success or failure of\r
+is invoked.  Its exit status determines the success or failure of\r

 the ref update.</p>\r
 <p>The hook executes once for each ref to be updated, and takes\r
 three parameters:\r
 the ref update.</p>\r
 <p>The hook executes once for each ref to be updated, and takes\r
 three parameters:\r


@@ -393,7 +393,7 @@ you can redirect your output to your stderr.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:39 UTC\r
+Last updated 07-Jun-2006 19:51:36 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.txt b/hooks.txt
index e3dde39..898b4aa 100644 (file)
--- a/hooks.txt
+++ b/hooks.txt
@@ -100,7 +100,7 @@ update
 This hook is invoked by `git-receive-pack` on the remote repository,
 which is happens when a `git push` is done on a local repository.
 Just before updating the ref on the remote repository, the update hook
 This hook is invoked by `git-receive-pack` on the remote repository,
 which is happens when a `git push` is done on a local repository.
 Just before updating the ref on the remote repository, the update hook

-is invoked.  It's exit status determines the success or failure of
+is invoked.  Its exit status determines the success or failure of

 the ref update.
 
 The hook executes once for each ref to be updated, and takes
 the ref update.
 
 The hook executes once for each ref to be updated, and takes

diff --git a/tutorial.html b/tutorial.html
index cfa8273..6ef57a7 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -565,7 +565,7 @@ names.  For example:</p>
 $ git branch stable v2.5 # start a new branch named "stable" based\r
                          # at v2.5\r
 $ git reset --hard HEAD^ # reset your current branch and working\r
 $ git branch stable v2.5 # start a new branch named "stable" based\r
                          # at v2.5\r
 $ git reset --hard HEAD^ # reset your current branch and working\r

-                         # directory its state at HEAD^</tt></pre>\r
+                         # directory to its state at HEAD^</tt></pre>\r

 </div></div>\r
 <p>Be careful with that last command: in addition to losing any changes\r
 in the working directory, it will also remove all later commits from\r
 </div></div>\r
 <p>Be careful with that last command: in addition to losing any changes\r
 in the working directory, it will also remove all later commits from\r


@@ -701,7 +701,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 04-Jun-2006 07:24:34 UTC\r
+Last updated 07-Jun-2006 19:51:35 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.txt b/tutorial.txt
index db56312..554ee0a 100644 (file)
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -357,7 +357,7 @@ $ git diff v2.5 HEAD         # compare the current HEAD to v2.5
 $ git branch stable v2.5 # start a new branch named "stable" based
                         # at v2.5
 $ git reset --hard HEAD^ # reset your current branch and working
 $ git branch stable v2.5 # start a new branch named "stable" based
                         # at v2.5
 $ git reset --hard HEAD^ # reset your current branch and working

-                        # directory its state at HEAD^
+                        # directory to its state at HEAD^

 -------------------------------------
 
 Be careful with that last command: in addition to losing any changes
 -------------------------------------
 
 Be careful with that last command: in addition to losing any changes