From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jul 2015 19:21:46 +0000 (-0700)
Subject: Merge branch 'mm/branch-doc-updates' into maint
X-Git-Tag: v2.4.7~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5?ds=inline;hp=-c

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

* mm/branch-doc-updates:
Documentation/branch: document -M and -D in terms of --force
Documentation/branch: document -d --force and -m --force
---

315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5
diff --combined Documentation/git-branch.txt
index 359619b552,ef78464d76..a67138a022
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -51,7 -51,7 +51,7 @@@ When a local branch is started off a re
  branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
  configuration entries) so that 'git pull' will appropriately merge from
  the remote-tracking branch. This behavior may be changed via the global
 -`branch.autosetupmerge` configuration flag. That setting can be
 +`branch.autoSetupMerge` configuration flag. That setting can be
  overridden by using the `--track` and `--no-track` options, and
  changed later using `git branch --set-upstream-to`.
  
@@@ -81,7 -81,7 +81,7 @@@ OPTION
  	`--track` or `--set-upstream`.
  
  -D::
- 	Delete a branch irrespective of its merged status.
+ 	Shortcut for `--delete --force`.
  
  -l::
  --create-reflog::
@@@ -95,13 -95,17 +95,17 @@@
  --force::
  	Reset <branchname> to <startpoint> if <branchname> exists
  	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::
  --move::
  	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
@@@ -166,14 -170,14 +170,14 @@@ This option is only applicable in non-v
  	upstream when the new branch is checked out.
  +
  This behavior is the default when the start point is a remote-tracking branch.
 -Set the branch.autosetupmerge configuration variable to `false` if you
 +Set the branch.autoSetupMerge configuration variable to `false` if you
  want `git checkout` and `git branch` to always behave as if '--no-track'
  were given. Set it to `always` if you want this behavior when the
  start-point is either a local or remote-tracking branch.
  
  --no-track::
  	Do not set up "upstream" configuration, even if the
 -	branch.autosetupmerge configuration variable is true.
 +	branch.autoSetupMerge configuration variable is true.
  
  --set-upstream::
  	If specified branch does not exist yet or if `--force` has been