undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/branch: document -M and -D in terms of --force

Browse Source 
Now that we have proper documentation for --force's interaction with -d
and -m, we can avoid duplication and consider -M and -D as convenience
aliases for -m --force and -d --force.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2015-07-02 16:07:21 +02:00 committed by Junio C Hamano
parent 8482d042a0
commit 83fe16703e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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::
@ -105,7 +105,7 @@ OPTIONS
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