summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-19 05:45:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-19 05:45:45 (GMT)
commita4ebf9e0c53d03677175a1b32c7a9156c668ee33 (patch)
tree964fe1413f2fd9f698cd283f5981aca069bc9b05 /Documentation
parente336afdfb67384aa058eeb47687545f0492ed40c (diff)
parente61cb19a2782f31ecad59b64f4a4fd40e23759b4 (diff)
downloadgit-a4ebf9e0c53d03677175a1b32c7a9156c668ee33.zip
git-a4ebf9e0c53d03677175a1b32c7a9156c668ee33.tar.gz
git-a4ebf9e0c53d03677175a1b32c7a9156c668ee33.tar.bz2
Merge branch 'jc/branch-force-doc-readability-fix'
Doc update. * jc/branch-force-doc-readability-fix: branch doc: sprinkle a few commas for readability
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index fe029ac..d6587c5 100644
--- 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