Autogenerated HTML docs for v1.1.5-g36b5

diff --git a/git-branch.html b/git-branch.html
index fb41e08..20e8847 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -272,7 +272,7 @@ git-branch(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-branch</em> [-d | -D] [&lt;branchname&gt; [start-point]]</p>\r
+<p><em>git-branch</em> [(-d | -D) &lt;branchname&gt;] | [[-f] &lt;branchname&gt; [&lt;start-point&gt;]]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -301,6 +301,14 @@ created, otherwise it will be created at the current HEAD.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-f\r
+</dt>\r
+<dd>\r
+<p>\r
+        Force a reset of &lt;branchname&gt; to &lt;start-point&gt; (or current head).\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;branchname&gt;\r
 </dt>\r
 <dd>\r
@@ -309,7 +317,7 @@ created, otherwise it will be created at the current HEAD.</p>
 </p>\r
 </dd>\r
 <dt>\r
-start-point\r
+&lt;start-point&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -364,7 +372,7 @@ commits from todo branch.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:49 PDT\r
+Last updated 29-Jan-2006 20:18:17 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index d20b475..b1bc827 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -7,7 +7,7 @@ git-branch - Create a new branch, or remove an old one.
 
 SYNOPSIS
 --------
-'git-branch' [-d | -D] [<branchname> [start-point]]
+'git-branch' [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]
 
 DESCRIPTION
 -----------
@@ -25,10 +25,13 @@ OPTIONS
 -D::
        Delete a branch irrespective of its index status.
 
+-f::
+       Force a reset of <branchname> to <start-point> (or current head).
+
 <branchname>::
        The name of the branch to create or delete.
 
-start-point::
+<start-point>::
        Where to create the branch; defaults to HEAD. This
        option has no meaning with -d and -D.
 

diff --git a/git-push.html b/git-push.html
index 1f1334b..c74e3a6 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -537,10 +537,10 @@ A parameter <ref> without a colon is equivalent to
 </dt>\r
 <dd>\r
 <p>\r
-        Usually, the command refuses to update a local ref that is\r
-        not an ancestor of the remote ref used to overwrite it.\r
-        This flag disables the check.  What this means is that the\r
-        local repository can lose commits; use it with care.\r
+        Usually, the command refuses to update a remote ref that is\r
+        not a descendent of the local ref used to overwrite it.\r
+        This flag disables the check.  This can cause the\r
+        remote repository to lose commits; use it with care.\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -559,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 16-Jan-2006 00:23:10 PDT\r
+Last updated 29-Jan-2006 20:18:18 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.txt b/git-push.txt
index 365cfd4..a0ef61d 100644 (file)
--- a/git-push.txt
+++ b/git-push.txt
@@ -35,10 +35,10 @@ include::pull-fetch-param.txt[]
        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.
-       This flag disables the check.  What this means is that the
-       local repository can lose commits; use it with care.
+       Usually, the command refuses to update a remote ref that is
+       not a descendent of the local ref used to overwrite it.
+       This flag disables the check.  This can cause the
+       remote repository to lose commits; use it with care.
 
 
 Author