mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/branch-doc-updates' into maint

Browse Source 
* mm/branch-doc-updates:
  Documentation/branch: document -M and -D in terms of --force
  Documentation/branch: document -d --force and -m --force
This commit is contained in:
Junio C Hamano
2015-07-27 12:21:46 -07:00
parent bde6a72af5 83fe16703e
commit 315b3ba3e4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-branch.txt
View File

@ -81,7 +81,7 @@ OPTIONS
`--track` or `--set-upstream`. `--track` or `--set-upstream`.
-D:: -D::
Delete a branch irrespective of its merged status. Shortcut for `--delete --force`.
-l:: -l::
--create-reflog:: --create-reflog::
@ -95,13 +95,17 @@ OPTIONS
--force:: --force::
Reset <branchname> to <startpoint> if <branchname> exists Reset <branchname> to <startpoint> if <branchname> exists
already. Without `-f` 'git branch' refuses to change an existing branch. already. Without `-f` 'git branch' refuses to change an existing branch.
In combination with `-d` (or `--delete`), allow deleting the
branch irrespective of its merged status. In combination with
`-m` (or `--move`), allow renaming the branch even if the new
branch name already exists.
-m:: -m::
--move:: --move::
Move/rename a branch and the corresponding reflog. Move/rename a branch and the corresponding reflog.
-M:: -M::
Move/rename a branch even if the new branch name already exists. Shortcut for `--move --force`.
--color[=<when>]:: --color[=<when>]::
Color branches to highlight current, local, and Color branches to highlight current, local, and