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>

Matthieu Moy committed Jul 2, 2015 at 16:07 UTC 8482d042a016aaae1e564f9c34b4d5f6b59794be
1 file changed +4
Documentation/git-branch.txt
+4
@@ -95,6 +95,10 @@ OPTIONS
95 --force::
96 Reset <branchname> to <startpoint> if <branchname> exists
97 already. Without `-f` 'git branch' refuses to change an existing branch.
98 + In combination with `-d` (or `--delete`), allow deleting the
99 + branch irrespective of its merged status. In combination with
100 + `-m` (or `--move`), allow renaming the branch even if the new
101 + branch name already exists.
102
103 -m::
104 --move::