Skip to content

Commit 83fe167

Browse files
moygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8482d04 commit 83fe167

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-branch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ OPTIONS
8181
`--track` or `--set-upstream`.
8282

8383
-D::
84-
Delete a branch irrespective of its merged status.
84+
Shortcut for `--delete --force`.
8585

8686
-l::
8787
--create-reflog::
@@ -105,7 +105,7 @@ OPTIONS
105105
Move/rename a branch and the corresponding reflog.
106106

107107
-M::
108-
Move/rename a branch even if the new branch name already exists.
108+
Shortcut for `--move --force`.
109109

110110
--color[=<when>]::
111111
Color branches to highlight current, local, and

0 commit comments

Comments
 (0)