Autogenerated HTML docs for v1.5.5.1-315-g6d2c1c

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 3c7d6000a1ed45a97459bc943d6e25702d1425ec..ba8127bf626790f1bfbe509b6f2fe52c3fe64c24 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -493,6 +493,9 @@ or copyright violation) from all commits:</p>
 <div class="content">\r
 <pre><tt>git filter-branch --tree-filter 'rm filename' HEAD</tt></pre>\r
 </div></div>\r
+<p>However, if the file is absent from the tree of some commit,\r
+a simple <tt>rm filename</tt> will fail for that tree and commit.\r
+Thus you may instead want to use <tt>rm -f filename</tt> as the script.</p>\r
 <p>A significantly faster version:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -611,7 +614,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-May-2008 06:34:58 UTC\r
+Last updated 17-May-2008 06:12:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 8d80f0d074c92fccc2a9746c5f374c1626fdde97..506c37af7021e2e16caab5ffe72bca9bc2f28927 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -183,6 +183,10 @@ or copyright violation) from all commits:
 git filter-branch --tree-filter 'rm filename' HEAD
 -------------------------------------------------------
 
+However, if the file is absent from the tree of some commit,
+a simple `rm filename` will fail for that tree and commit.
+Thus you may instead want to use `rm -f filename` as the script.
+
 A significantly faster version:
 
 --------------------------------------------------------------------------

diff --git a/git-submodule.html b/git-submodule.html
index 3eb9167639ecaaabbe4c3e8ca903d99a6bbf1cd9..7cb2e3d647334167d400b593300e64f78dcbe871 100644 (file)
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -275,7 +275,8 @@ git-submodule(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-submodule</em> [--quiet] add [-b branch] [--] &lt;repository&gt; [&lt;path&gt;]\r
 <em>git-submodule</em> [--quiet] status [--cached] [--] [&lt;path&gt;&#8230;]\r
-<em>git-submodule</em> [--quiet] [init|update] [--] [&lt;path&gt;&#8230;]\r
+<em>git-submodule</em> [--quiet] init [--] [&lt;path&gt;&#8230;]\r
+<em>git-submodule</em> [--quiet] update [--init] [--] [&lt;path&gt;&#8230;]\r
 <em>git-submodule</em> [--quiet] summary [--summary-limit &lt;n&gt;] [commit] [--] [&lt;path&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>COMMANDS</h2>\r
@@ -331,6 +332,9 @@ update
         checkout the commit specified in the index of the containing repository.\r
         This will make the submodules HEAD be detached.\r
 </p>\r
+<p>If the submodule is not yet initialized, and you just want to use the\r
+setting as stored in .gitmodules, you can automatically initialize the\r
+submodule with the --init option.</p>\r
 </dd>\r
 <dt>\r
 summary\r
@@ -415,7 +419,7 @@ for details.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Apr-2008 05:32:58 UTC\r
+Last updated 17-May-2008 06:12:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-submodule.txt b/git-submodule.txt
index 6ffd896fbc78b783a7e00ed462f879cbff29d758..0668f295eee14facf0f9c4dd6ed2830cb6a348f8 100644 (file)
--- a/git-submodule.txt
+++ b/git-submodule.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 [verse]
 'git-submodule' [--quiet] add [-b branch] [--] <repository> [<path>]
 'git-submodule' [--quiet] status [--cached] [--] [<path>...]
-'git-submodule' [--quiet] [init|update] [--] [<path>...]
+'git-submodule' [--quiet] init [--] [<path>...]
+'git-submodule' [--quiet] update [--init] [--] [<path>...]
 'git-submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
 
 
@@ -47,6 +48,10 @@ update::
        Update the registered submodules, i.e. clone missing submodules and
        checkout the commit specified in the index of the containing repository.
        This will make the submodules HEAD be detached.
++
+If the submodule is not yet initialized, and you just want to use the
+setting as stored in .gitmodules, you can automatically initialize the
+submodule with the --init option.
 
 summary::
        Show commit summary between the given commit (defaults to HEAD) and

diff --git a/git-web--browse.html b/git-web--browse.html
index ebc92fb09850177fcbb30b439ae4d25ef9bd2713..8ed493c43d036ee9f1750c4ad472a0b9ef544799 100644 (file)
--- a/git-web--browse.html
+++ b/git-web--browse.html
@@ -380,7 +380,7 @@ the URLs passed as arguments.</p>
 <p>When <em>konqueror</em> is specified by the a command line option or a\r
 configuration variable, we launch <em>kfmclient</em> to try to open the HTML\r
 man page on an already opened konqueror in a new tab if possible.</p>\r
-<p>For consistency, we also try such a trick if <em>brower.konqueror.path</em> is\r
+<p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is\r
 set to something like <em>A_PATH_TO/konqueror</em>. That means we will try to\r
 launch <em>A_PATH_TO/kfmclient</em> instead.</p>\r
 <p>If you really want to use <em>konqueror</em>, then you can use something like\r
@@ -419,7 +419,7 @@ git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-May-2008 05:45:39 UTC\r
+Last updated 17-May-2008 06:12:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-web--browse.txt b/git-web--browse.txt
index 92ef57456581d98f066cabd2e6be84e73b7ae063..5ba0b9f1c9214b33948354f6b85c2b343674cbe5 100644 (file)
--- a/git-web--browse.txt
+++ b/git-web--browse.txt
@@ -78,7 +78,7 @@ When 'konqueror' is specified by the a command line option or a
 configuration variable, we launch 'kfmclient' to try to open the HTML
 man page on an already opened konqueror in a new tab if possible.
 
-For consistency, we also try such a trick if 'brower.konqueror.path' is
+For consistency, we also try such a trick if 'browser.konqueror.path' is
 set to something like 'A_PATH_TO/konqueror'. That means we will try to
 launch 'A_PATH_TO/kfmclient' instead.