Autogenerated HTML docs for v1.5.2.1-271-g90ac

diff --git a/git-blame.html b/git-blame.html
index e2bc335ab1f4dbbe807b46ee1fe035b4ab83e461..556ca739916d060e9a8335b20a10ef33262b65fc 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -273,7 +273,7 @@ git-blame(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-blame</em> [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]\r
+<div class="content"><em>git-blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]\r
             [-S &lt;revs-file&gt;] [-M] [-C] [-C] [--since=&lt;date&gt;]\r
             [&lt;rev&gt; | --contents &lt;file&gt;] [--] &lt;file&gt;</div></div>\r
 </div>\r
@@ -510,6 +510,15 @@ commit.</tt></pre>
         Suppress author name and timestamp from the output.\r
 </p>\r
 </dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Ignore whitespace when comparing parent's version and\r
+        child's to find where the lines came from.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>THE PORCELAIN FORMAT</h2>\r
@@ -683,7 +692,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:01 UTC\r
+Last updated 13-Jun-2007 08:29:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.txt b/git-blame.txt
index 44678b0c3601512df024e3670aadeabd5317b0c9..66f1203701350f42cb028c6971c169ac129332ec 100644 (file)
--- a/git-blame.txt
+++ b/git-blame.txt
@@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file
 SYNOPSIS
 --------
 [verse]
-'git-blame' [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]
+'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
             [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
             [<rev> | --contents <file>] [--] <file>
 
@@ -63,6 +63,11 @@ include::blame-options.txt[]
 -s::
        Suppress author name and timestamp from the output.
 
+-w::
+       Ignore whitespace when comparing parent's version and
+       child's to find where the lines came from.
+
+
 THE PORCELAIN FORMAT
 --------------------
 

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 61d7daeb9d25bfdb22ac32e08e2e039470e14c9d..0ab2f4fe1e7e105ee30216f44f1112e05b5ab24d 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -277,7 +277,7 @@ git-cvsimport(1) Manual Page
               [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]\r
               [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\r
               [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]\r
-              [&lt;CVS_module&gt;]</div></div>\r
+              [-r &lt;remote&gt;] [&lt;CVS_module&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -286,10 +286,11 @@ repository, or incrementally import into an existing one.</p>
 <p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.\r
 At least version 2.1 is required.</p>\r
 <p>You should <strong>never</strong> do any work of your own on the branches that are\r
-created by git-cvsimport. The initial import will create and populate a\r
+created by git-cvsimport.  By default initial import will create and populate a\r
 "master" branch from the CVS repository's main branch which you're free\r
 to work with; after that, you need to <em>git merge</em> incremental imports, or\r
-any CVS branches, yourself.</p>\r
+any CVS branches, yourself.  It is advisable to specify a named remote via\r
+-r to separate and protect the incoming branches.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -334,13 +335,27 @@ any CVS branches, yourself.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-r &lt;remote&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        The git remote to import this CVS repository into.\r
+        Moves all CVS branches into remotes/&lt;remote&gt;/&lt;branch&gt;\r
+        akin to the git-clone --use-separate-remote option.\r
+</p>\r
+</dd>\r
+<dt>\r
 -o &lt;branch-for-HEAD&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
-        The <em>HEAD</em> branch from CVS is imported to the <em>origin</em> branch within\r
-        the git repository, as <em>HEAD</em> already has a special meaning for git.\r
-        Use this option if you want to import into a different branch.\r
+        When no remote is specified (via -r) the <em>HEAD</em> branch\r
+        from CVS is imported to the <em>origin</em> branch within the git\r
+        repository, as <em>HEAD</em> already has a special meaning for git.\r
+        When a remote is specified the <em>HEAD</em> branch is named\r
+        remotes/&lt;remote&gt;/master mirroring git-clone behaviour.\r
+        Use this option if you want to import into a different\r
+        branch.\r
 </p>\r
 <p>Use <em>-o master</em> for continuing an import that was initially done by\r
 the old cvs2git tool.</p>\r
@@ -511,7 +526,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 08-Jun-2007 16:08:06 UTC\r
+Last updated 13-Jun-2007 08:29:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 3985e0164b3f320258a5f6b2699a9145a30e5e43..fdd7ec7edd8d655a1f660db7eca90ee8cfa9ffc2 100644 (file)
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -13,7 +13,7 @@ SYNOPSIS
              [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
              [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
              [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
-             [<CVS_module>]
+             [-r <remote>] [<CVS_module>]
 
 
 DESCRIPTION
@@ -25,10 +25,12 @@ Splitting the CVS log into patch sets is done by 'cvsps'.
 At least version 2.1 is required.
 
 You should *never* do any work of your own on the branches that are
-created by git-cvsimport. The initial import will create and populate a
+created by git-cvsimport.  By default initial import will create and populate a
 "master" branch from the CVS repository's main branch which you're free
 to work with; after that, you need to 'git merge' incremental imports, or
-any CVS branches, yourself.
+any CVS branches, yourself.  It is advisable to specify a named remote via
+-r to separate and protect the incoming branches.
+
 
 OPTIONS
 -------
@@ -51,10 +53,19 @@ OPTIONS
         The git repository to import to.  If the directory doesn't
         exist, it will be created.  Default is the current directory.
 
+-r <remote>::
+       The git remote to import this CVS repository into.
+       Moves all CVS branches into remotes/<remote>/<branch>
+       akin to the git-clone --use-separate-remote option.
+
 -o <branch-for-HEAD>::
-       The 'HEAD' branch from CVS is imported to the 'origin' branch within
-       the git repository, as 'HEAD' already has a special meaning for git.
-       Use this option if you want to import into a different branch.
+       When no remote is specified (via -r) the 'HEAD' branch
+       from CVS is imported to the 'origin' branch within the git
+       repository, as 'HEAD' already has a special meaning for git.
+       When a remote is specified the 'HEAD' branch is named
+       remotes/<remote>/master mirroring git-clone behaviour.
+       Use this option if you want to import into a different
+       branch.
 +
 Use '-o master' for continuing an import that was initially done by
 the old cvs2git tool.