Documentation/branch: document -M and -D in terms of --force
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>
Matthieu Moy committed
Jul 2, 2015 at 16:07 UTC
83fe16703e3f5c39078db11449fd43f24a8f32f0
1 file changed
+2
-2
Documentation/git-branch.txt
+2
-2
@@ -81,7 +81,7 @@ OPTIONS
81
`--track` or `--set-upstream`.
82
83
-D::
84
- Delete a branch irrespective of its merged status.
84
+ Shortcut for `--delete --force`.
85
86
-l::
87
--create-reflog::
@@ -105,7 +105,7 @@ OPTIONS
105
Move/rename a branch and the corresponding reflog.
106
107
-M::
108
- Move/rename a branch even if the new branch name already exists.
108
+ Shortcut for `--move --force`.
109
110
--color[=<when>]::
111
Color branches to highlight current, local, and