From: Matthieu Moy Date: Thu, 2 Jul 2015 14:07:20 +0000 (+0200) Subject: Documentation/branch: document -d --force and -m --force X-Git-Tag: v2.4.7~4^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8482d042a016aaae1e564f9c34b4d5f6b59794be?ds=inline;hp=--cc 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 Signed-off-by: Junio C Hamano --- 8482d042a016aaae1e564f9c34b4d5f6b59794be diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 311b33674e..d5ff57ced1 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -95,6 +95,10 @@ OPTIONS --force:: Reset to if 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::