From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 30 Jan 2006 04:21:28 +0000 (-0800)
Subject: Autogenerated man pages for v1.1.5-g36b5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4435ad63e6f24548eb20d069b31a51540907383f;p=git.git

Autogenerated man pages for v1.1.5-g36b5
---

diff --git a/man1/git-branch.1 b/man1/git-branch.1
index 071f65647..dfe3a760d 100755
--- a/man1/git-branch.1
+++ b/man1/git-branch.1
@@ -23,7 +23,7 @@ git-branch \- Create a new branch, or remove an old one.
 .SH "SYNOPSIS"
 
 
-git\-branch [\-d | \-D] [<branchname> [start\-point]]
+git\-branch [(\-d | \-D) <branchname>] | [[\-f] <branchname> [<start\-point>]]
 
 .SH "DESCRIPTION"
 
@@ -43,12 +43,16 @@ Delete a branch\&. The branch must be fully merged\&.
 \-D
 Delete a branch irrespective of its index status\&.
 
+.TP
+\-f
+Force a reset of <branchname> to <start\-point> (or current head)\&.
+
 .TP
 <branchname>
 The name of the branch to create or delete\&.
 
 .TP
-start\-point
+<start\-point>
 Where to create the branch; defaults to HEAD\&. This option has no meaning with \-d and \-D\&.
 
 .SS "Examples"
diff --git a/man1/git-push.1 b/man1/git-push.1
index 54677a363..789469f2b 100755
--- a/man1/git-push.1
+++ b/man1/git-push.1
@@ -175,7 +175,7 @@ All refs under $GIT_DIR/refs/tags are pushed, in addition to refspecs explicitly
 
 .TP
 \-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\&.
 
 .SH "AUTHOR"