git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Tomas Nordin <tomasn@posteo.net>
Cc: git@vger.kernel.org, Charvi Mendiratta <charvi077@gmail.com>
Subject: Re: Unbalanced closing paren in help of git commit
Date: Mon, 08 Jul 2024 12:57:46 -0700	[thread overview]
Message-ID: <xmqqcynnejwl.fsf@gitster.g> (raw)
In-Reply-To: <87o7792xgu.fsf@posteo.net> (Tomas Nordin's message of "Sun, 07 Jul 2024 12:33:21 +0000")

Tomas Nordin <tomasn@posteo.net> writes:

> Hello List
>
> The second line of the help message for git commit looks like this:

This seems to have come from 00ea64ed (doc/git-commit: add
documentation for fixup=[amend|reword] options, 2021-03-15),
if "git blame" is to be trusted.

>     [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]

We can have --dry-run but we do not have to, we can have only one of

    "-c <commit>"
    "-C <commit>",
    "--squash <commit>",
    "--fixup amend:<commit>"
    "--fixup reword:<commit>", or
    "--fixup <commit>"

as they are mutually exclusive, but it is OK if we have none of
them.

The last closing parenthesis after <commit> but before the closing
square bracket is unwanted, I think, as you pointed out.


  parent reply	other threads:[~2024-07-08 19:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-07 12:33 Unbalanced closing paren in help of git commit Tomas Nordin
2024-07-08  8:54 ` Jeff King
2024-07-08 19:35   ` Tomas Nordin
2024-07-08 23:35     ` Jeff King
2024-07-08 19:57 ` Junio C Hamano [this message]
2024-07-21 12:21   ` Tomas Nordin
2024-07-22 18:58     ` Junio C Hamano
2024-07-22 22:59       ` Tomas Nordin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqcynnejwl.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=charvi077@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=tomasn@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).