Autogenerated HTML docs for v1.1.2-g4230

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 20f90f0..9295c05 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -425,6 +425,39 @@ the old cvs2git tool.</p>
         Substitute the character "/" in branch names with &lt;subst&gt;\r
 </p>\r
 </dd>\r
+<dt>\r
+-A &lt;author-conv-file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        CVS by default uses the unix username when writing its\r
+        commit logs. Using this option and an author-conv-file\r
+        in this format\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>exon=Andreas Ericsson &lt;ae@op5.se&gt;\r
+spawn=Simon Pawn &lt;spawn@frog-pond.org&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-cvsimport will make it appear as those authors had\r
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly\r
+all along.</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>For convenience, this data is saved to $GIT_DIR/cvs-authors\r
+each time the -A option is provided and read from that same\r
+file each time git-cvsimport is run.</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>It is not recommended to use this feature if you intend to\r
+export changes back to CVS again later with\r
+git-link[1]::git-cvsexportcommit.</tt></pre>\r
+</div></div>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>OUTPUT</h2>\r
@@ -448,7 +481,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:15 PDT\r
+Last updated 16-Jan-2006 00:23:09 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 01ca7ef..dfe86ce 100644 (file)
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -89,6 +89,26 @@ If you need to pass multiple options, separate them with a comma.
 -s <subst>::
        Substitute the character "/" in branch names with <subst>
 
+-A <author-conv-file>::
+       CVS by default uses the unix username when writing its
+       commit logs. Using this option and an author-conv-file
+       in this format
+
+       exon=Andreas Ericsson <ae@op5.se>
+       spawn=Simon Pawn <spawn@frog-pond.org>
+
+       git-cvsimport will make it appear as those authors had
+       their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+       all along.
+
+       For convenience, this data is saved to $GIT_DIR/cvs-authors
+       each time the -A option is provided and read from that same
+       file each time git-cvsimport is run.
+
+       It is not recommended to use this feature if you intend to
+       export changes back to CVS again later with
+       git-link[1]::git-cvsexportcommit.
+
 OUTPUT
 ------
 If '-v' is specified, the script reports what it is doing.

diff --git a/git-push.html b/git-push.html
index 52a5642..1f1334b 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -272,7 +272,7 @@ git-push(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-push</em> [--all] [--force] &lt;repository&gt; &lt;refspec&gt;&#8230;</p>\r
+<p><em>git-push</em> [--all] [--tags] [--force] &lt;repository&gt; &lt;refspec&gt;&#8230;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -523,6 +523,16 @@ A parameter &lt;ref&gt; without a colon is equivalent to
 </p>\r
 </dd>\r
 <dt>\r
+--tags\r
+</dt>\r
+<dd>\r
+<p>\r
+        All refs under <tt>$GIT_DIR/refs/tags</tt> are pushed, in\r
+        addition to refspecs explicitly listed on the command\r
+        line.\r
+</p>\r
+</dd>\r
+<dt>\r
 -f, --force\r
 </dt>\r
 <dd>\r
@@ -549,7 +559,7 @@ A parameter &lt;ref&gt; without a colon is equivalent to
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Jan-2006 19:58:29 PDT\r
+Last updated 16-Jan-2006 00:23:10 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.txt b/git-push.txt
index 2254bac..365cfd4 100644 (file)
--- a/git-push.txt
+++ b/git-push.txt
@@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects.
 
 SYNOPSIS
 --------
-'git-push' [--all] [--force] <repository> <refspec>...
+'git-push' [--all] [--tags] [--force] <repository> <refspec>...
 
 DESCRIPTION
 -----------
@@ -29,6 +29,11 @@ include::pull-fetch-param.txt[]
        Instead of naming each ref to push, specifies all refs
        to be pushed.
 
+\--tags::
+       All refs under `$GIT_DIR/refs/tags` are pushed, in
+       addition to refspecs explicitly listed on the command
+       line.
+
 -f, \--force::
        Usually, the command refuses to update a local ref that is
        not an ancestor of the remote ref used to overwrite it.