diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:46 -0700 |
| commit | 315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5 (patch) | |
| tree | 1d9e1c2af033f6a491fba10bbd41bcaa7586be96 | |
| parent | bde6a72af5b5dc9f1e489c8103ea900e266ab766 (diff) | |
| parent | 83fe16703e3f5c39078db11449fd43f24a8f32f0 (diff) | |
| download | git-315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5.tar.gz git-315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5.tar.xz | |
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
| -rw-r--r-- | Documentation/git-branch.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 359619b55..a67138a02 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -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:: @@ -95,13 +95,17 @@ OPTIONS --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 |