diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-29 17:56:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-29 17:56:45 -0800 |
| commit | 36b5b3c65948694d9a92de5a17f2b97c3cd84879 (patch) | |
| tree | fa20efe758607290af652d3c32b110a483059b86 /Documentation | |
| parent | 34801cab72e8262d2585f72f15b62a397f0c6c1a (diff) | |
| parent | 8fedb83c05d4b3d877a220d614e8b9d40f02709d (diff) | |
| download | git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.gz git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.xz | |
Merge fixes up to GIT 1.1.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-push.txt | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d20b47573..b1bc8272e 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 365cfd410..a0ef61daf 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 |