From 4435ad63e6f24548eb20d069b31a51540907383f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Jan 2006 20:21:28 -0800 Subject: [PATCH] Autogenerated man pages for v1.1.5-g36b5 --- man1/git-branch.1 | 8 ++++++-- man1/git-push.1 | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 071f6564..dfe3a760 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] [ [start\-point]] +git\-branch [(\-d | \-D) ] | [[\-f] []] .SH "DESCRIPTION" @@ -44,11 +44,15 @@ Delete a branch\&. The branch must be fully merged\&. Delete a branch irrespective of its index status\&. .TP +\-f +Force a reset of to (or current head)\&. + +.TP The name of the branch to create or delete\&. .TP -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 54677a36..789469f2 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" -- 2.11.0