diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 11:34:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 13:26:57 +0900 |
| commit | e61cb19a2782f31ecad59b64f4a4fd40e23759b4 (patch) | |
| tree | 5003329ea4655915c133608b13e237565b6d4312 /Documentation/git-branch.txt | |
| parent | 4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 (diff) | |
| download | git-e61cb19a2782f31ecad59b64f4a4fd40e23759b4.tar.gz | |
branch doc: sprinkle a few commas for readabilityjc/branch-force-doc-readability-fix
The "--force" option can also be used when the named branch does not
yet exist, and the point of the option is the user can (re)point the
branch to the named commit even if it does. Add 'even' before 'if'
to clarify. Also, insert another comma after "Without -f" before
"the command refuses..." to make the text easier to parse.
Incidentally, this change should help certain versions of
docbook-xsl-stylesheets that render the original without any
whitespace between "-f" and "git".
Noticed-by: Lars Schneider <larsxschneider@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d0b3358771..3672195b3a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -99,8 +99,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 |