From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 30 Jan 2006 04:19:57 +0000 (-0800)
Subject: Autogenerated HTML docs for v1.1.5-g36b5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=560a1f6414df207911062a54e3f8a6c0f0721195;p=git.git

Autogenerated HTML docs for v1.1.5-g36b5
---

diff --git a/git-branch.html b/git-branch.html
index fb41e087..20e8847d 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -272,7 +272,7 @@ git-branch(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-branch</em> [-d | -D] [&lt;branchname&gt; [start-point]]</p>
+<p><em>git-branch</em> [(-d | -D) &lt;branchname&gt;] | [[-f] &lt;branchname&gt; [&lt;start-point&gt;]]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -301,6 +301,14 @@ created, otherwise it will be created at the current HEAD.</p>
 </p>
 </dd>
 <dt>
+-f
+</dt>
+<dd>
+<p>
+        Force a reset of &lt;branchname&gt; to &lt;start-point&gt; (or current head).
+</p>
+</dd>
+<dt>
 &lt;branchname&gt;
 </dt>
 <dd>
@@ -309,7 +317,7 @@ created, otherwise it will be created at the current HEAD.</p>
 </p>
 </dd>
 <dt>
-start-point
+&lt;start-point&gt;
 </dt>
 <dd>
 <p>
@@ -364,7 +372,7 @@ commits from todo branch.</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:15:49 PDT
+Last updated 29-Jan-2006 20:18:17 PDT
 </div>
 </div>
 </body>
diff --git a/git-branch.txt b/git-branch.txt
index d20b4757..b1bc8272 100644
--- 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 1f1334bb..c74e3a62 100644
--- a/git-push.html
+++ b/git-push.html
@@ -537,10 +537,10 @@ A parameter &lt;ref&gt; without a colon is equivalent to
 </dt>
 <dd>
 <p>
-        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.
 </p>
 </dd>
 </dl>
@@ -559,7 +559,7 @@ A parameter &lt;ref&gt; without a colon is equivalent to
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 16-Jan-2006 00:23:10 PDT
+Last updated 29-Jan-2006 20:18:18 PDT
 </div>
 </div>
 </body>
diff --git a/git-push.txt b/git-push.txt
index 365cfd41..a0ef61da 100644
--- 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