Autogenerated HTML docs for v1.5.2-rc0-14-g520d

diff --git a/config.txt b/config.txt
index b13ff3a1bbedb70766f08b2e4d9b5048a4903d4d..e0aff5369f3b7ee3059095fc3531779e452e1db1 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -300,6 +300,10 @@ branch.<name>.merge::
        branch.<name>.merge to the desired branch, and use the special setting
        `.` (a period) for branch.<name>.remote.
 
+clean.requireForce::
+       A boolean to make git-clean do nothing unless given -f or -n.  Defaults
+       to false.
+
 color.branch::
        A boolean to enable/disable color in the output of
        gitlink:git-branch[1]. May be set to `true` (or `always`),

diff --git a/git-checkout.html b/git-checkout.html
index e67e39b28454e13e3776218d6b3cbd8a9ed14f27..12ca850624f38eea50762ecfea0d35699b4ac746 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -273,7 +273,7 @@ git-checkout(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-checkout</em> [-q] [-f] [-b [--track | --no-track] &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
+<div class="content"><em>git-checkout</em> [-q] [-f] [[--track | --no-track] -b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
 <em>git-checkout</em> [&lt;tree-ish&gt;] &lt;paths&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -537,7 +537,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:40 UTC\r
+Last updated 24-Apr-2007 07:34:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 4f2e847dc3fe44f503a578fc79496179c21ac11a..918d8ee720a573f91ec6efa654da5c2cdc05d7b0 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch
 SYNOPSIS
 --------
 [verse]
-'git-checkout' [-q] [-f] [-b [--track | --no-track] <new_branch> [-l]] [-m] [<branch>]
+'git-checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
 'git-checkout' [<tree-ish>] <paths>...
 
 DESCRIPTION

diff --git a/git-clean.html b/git-clean.html
index 346cfb07d1eaccd02ed4acd621ce8b764109413b..2688b3785f3798dcd0cd674d143d0b0b72d3dda8 100644 (file)
--- a/git-clean.html
+++ b/git-clean.html
@@ -273,7 +273,7 @@ git-clean(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-clean</em> [-d] [-n] [-q] [-x | -X] [--] &lt;paths&gt;&#8230;</div></div>\r
+<div class="content"><em>git-clean</em> [-d] [-f] [-n] [-q] [-x | -X] [--] &lt;paths&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -296,6 +296,15 @@ affected are further limited to those that match them.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-f\r
+</dt>\r
+<dd>\r
+<p>\r
+        If the git configuration specifies clean.forceRequire as true,\r
+        git-clean will refuse to run unless given -f or -n.\r
+</p>\r
+</dd>\r
+<dt>\r
 -n\r
 </dt>\r
 <dd>\r
@@ -344,7 +353,7 @@ affected are further limited to those that match them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:32 UTC\r
+Last updated 24-Apr-2007 07:34:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clean.txt b/git-clean.txt
index c61afbcdbac49ccbb7ee755e3fdb19d7d77225d0..5aff026eb489a84640ffef6c8deed5b9f89e2b06 100644 (file)
--- a/git-clean.txt
+++ b/git-clean.txt
@@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
 SYNOPSIS
 --------
 [verse]
-'git-clean' [-d] [-n] [-q] [-x | -X] [--] <paths>...
+'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...
 
 DESCRIPTION
 -----------
@@ -25,6 +25,10 @@ OPTIONS
 -d::
        Remove untracked directories in addition to untracked files.
 
+-f::
+       If the git configuration specifies clean.forceRequire as true,
+       git-clean will refuse to run unless given -f or -n.
+
 -n::
        Don't actually remove anything, just show what would be done.
 

diff --git a/git-config.html b/git-config.html
index 2d6093b2f1301ddd5c60f9114cc252c3c25577cc..6bf0d0329c0095ddc075b0c50298d3300a322d26 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -967,6 +967,15 @@ branch.<name>.merge
 </p>\r
 </dd>\r
 <dt>\r
+clean.requireForce\r
+</dt>\r
+<dd>\r
+<p>\r
+        A boolean to make git-clean do nothing unless given -f or -n.  Defaults\r
+        to false.\r
+</p>\r
+</dd>\r
+<dt>\r
 color.branch\r
 </dt>\r
 <dd>\r
@@ -1645,7 +1654,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-Apr-2007 05:47:50 UTC\r
+Last updated 24-Apr-2007 07:34:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.html b/git-reset.html
index 2655e41b7268997b15c5b36e86a5a7217ef5f3a5..f5ab326d1fd74d1fe0f775735e8f5c4c94d9e103 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -365,6 +365,7 @@ make corrections to working tree files.
 commit by starting with its log message.  If you do not need to\r
 edit the message further, you can give -C option instead.\r
 </p>\r
+<p>See also the --amend option to <a href="git-commit.html">git-commit(1)</a>.</p>\r
 </li>\r
 </ol>\r
 </dd>\r
@@ -566,7 +567,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 04-Apr-2007 18:34:11 UTC\r
+Last updated 24-Apr-2007 07:34:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.txt b/git-reset.txt
index 5b55cda512bbdb507486ac5d0db0d28e32b1dcb1..19c5b9bbda60744723e453dceaa209c47a49cb60 100644 (file)
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -67,6 +67,8 @@ message, or both.  Leaves working tree as it was before "reset".
 <3> "reset" copies the old head to .git/ORIG_HEAD; redo the
 commit by starting with its log message.  If you do not need to
 edit the message further, you can give -C option instead.
++
+See also the --amend option to gitlink:git-commit[1].
 
 Undo commits permanently::
 +