Merge branch 'js/wincred-empty-cred' into maint

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index fe029ac6fc1a2280893c8ad7c36582c3f891a79e..d6587c5e96f4dbcdb4176d9dd5f6a992c0e83f3b 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -104,8 +104,8 @@ OPTIONS
 
 -f::
 --force::
-       Reset <branchname> to <startpoint> if <branchname> exists
-       already. Without `-f` 'git branch' refuses to change an existing branch.
+       Reset <branchname> to <startpoint>, even 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