Skip to content

Commit

Permalink
Documentation/branch: document -M and -D in terms of --force
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Jul 6, 2015
1 parent 8482d04 commit 83fe167
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-branch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ OPTIONS
`--track` or `--set-upstream`.

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

-l::
--create-reflog::
Expand All @@ -105,7 +105,7 @@ OPTIONS
Move/rename a branch and the corresponding reflog.

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

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

0 comments on commit 83fe167

Please sign in to comment.