diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-07-02 14:07:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-06 17:36:51 (GMT) |
| commit | 8482d042a016aaae1e564f9c34b4d5f6b59794be (patch) | |
| tree | 2e745d4813e97ffd2d25813c0a866a7b21851557 /Documentation | |
| parent | 356e91f2ecc581f3a446bba566ab1756dc57a583 (diff) | |
| download | git-8482d042a016aaae1e564f9c34b4d5f6b59794be.zip git-8482d042a016aaae1e564f9c34b4d5f6b59794be.tar.gz git-8482d042a016aaae1e564f9c34b4d5f6b59794be.tar.bz2 | |
Documentation/branch: document -d --force and -m --force
The --force option was modified in 356e91f (branch: allow -f with -m and
-d, 2014-12-08), but the documentation was not updated.
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, 4 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 311b336..d5ff57c 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -95,6 +95,10 @@ 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:: |