diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-07-02 16:07:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-06 10:36:54 -0700 |
| commit | 83fe16703e3f5c39078db11449fd43f24a8f32f0 (patch) | |
| tree | 3fbc70a5edace27e256f4d62ea5c207d4b32be67 /Documentation | |
| parent | 8482d042a016aaae1e564f9c34b4d5f6b59794be (diff) | |
| download | git-83fe16703e3f5c39078db11449fd43f24a8f32f0.tar.gz | |
Documentation/branch: document -M and -D in terms of --forcemm/branch-doc-updates
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d5ff57ced1..ef78464d76 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:: @@ -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 |