Re: Minor man page weirdness?
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 18, 2017, 02:34 UTC
- Message-ID
- <xmqqfuahkwug.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqq1sm1o5k5.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 13 quoted lines
> Andreas Schwab <schwab@linux-m68k.org> writes: > >> On Okt 16 2017, Jeff King <peff@peff.net> wrote: >> >>> We do have some hacks/workarounds for broken versions of the toolchain. >>> You can try tweaking various knobs you find in Documentation/Makefile). >>> DOCBOOK_SUPPRESS_SP sounds promising, but I think it actually does the >>> opposite (removes extra spaces). >> >> An easy workaround would be to add a comma between `-f` and 'git >> branch'. > > That sounds like a good idea, regardless of the mark-up issue.
-- >8 -- branch doc: sprinkle a few commas for readability
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 renders 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> --- Documentation/git-branch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index fe029ac6fc..d6587c5e96 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