From 560a1f6414df207911062a54e3f8a6c0f0721195 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Jan 2006 20:19:57 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.5-g36b5 --- git-branch.html | 14 +++++++++++--- git-branch.txt | 7 +++++-- git-push.html | 10 +++++----- git-push.txt | 8 ++++---- 4 files changed, 25 insertions(+), 14 deletions(-) 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

SYNOPSIS

-

git-branch [-d | -D] [<branchname> [start-point]]

+

git-branch [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]

DESCRIPTION

@@ -301,6 +301,14 @@ created, otherwise it will be created at the current HEAD.

+-f +
+
+

+ Force a reset of <branchname> to <start-point> (or current head). +

+
+
<branchname>
@@ -309,7 +317,7 @@ created, otherwise it will be created at the current HEAD.

-start-point +<start-point>

@@ -364,7 +372,7 @@ commits from todo branch.

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] [ [start-point]] +'git-branch' [(-d | -D) ] | [[-f] []] DESCRIPTION ----------- @@ -25,10 +25,13 @@ OPTIONS -D:: Delete a branch irrespective of its index status. +-f:: + Force a reset of to (or current head). + :: The name of the branch to create or delete. -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 <ref> without a colon is equivalent to

- 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.

@@ -559,7 +559,7 @@ A parameter <ref> without a colon is equivalent to 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 -- 2.11.0