summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-30 01:56:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-30 01:56:45 (GMT)
commit36b5b3c65948694d9a92de5a17f2b97c3cd84879 (patch)
treefa20efe758607290af652d3c32b110a483059b86 /Documentation
parent34801cab72e8262d2585f72f15b62a397f0c6c1a (diff)
parent8fedb83c05d4b3d877a220d614e8b9d40f02709d (diff)
downloadgit-36b5b3c65948694d9a92de5a17f2b97c3cd84879.zip
git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.gz
git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.bz2
Merge fixes up to GIT 1.1.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt7
-rw-r--r--Documentation/git-push.txt8
2 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d20b475..b1bc827 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/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/Documentation/git-push.txt b/Documentation/git-push.txt
index 365cfd4..a0ef61d 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/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