From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 2/3] commit: reorder synopsis
Date: Tue, 22 Sep 2020 09:16:22 -0700 [thread overview]
Message-ID: <xmqqeemtlrc9.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <2a14d3d2-743c-215e-aa69-de75a576f685@gmail.com> (Phillip Wood's message of "Tue, 22 Sep 2020 14:27:22 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> -'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
> - [--dry-run] [(-c | -C | --fixup | --squash) <commit>]
> - [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
> - [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
> - [--date=<date>] [--cleanup=<mode>] [--[no-]status]
> [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]
> [-S[<keyid>]] [--] [<pathspec>...]
> +'git commit' [-a | --interactive | --patch] [--amend]
> + [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>]
> + [--reset-author] [--author=<author>] [--date=<date>] [-s] [-e]
> + [--allow-empty] [--allow-empty-message] [--no-verify]
> + [--cleanup=<mode>] [-u<mode>] [--[no-]status] [-v] [--dry-run]
> [-i | -o | -p] [--pathspec-from-file=<file> [--pathspec-file-nul]]
> [-S[<keyid>]] [--] [<pathspec>...]
This seems to group them better than the original, including
"--allow-empty" and its two friends that are about sanity checking.
I would actually kick "-a" out of the "--interactive | --patch"
group [*1*]. Unlike the two, it is not about a different operation
mode. It is closer to how paths whose contents will participate in
the resulting commit are chosen, so it is much closer to the "-i"
and "-o" family, I would think.
What is "git commit -p" you have next to "-i" and "-o"? I do not
think it belongs there---isn't it a short form of --patch?
Thanks.
[Footnote]
*1* It was originally made that way because the "add--interactive"
based operation mode was incompatible with "-a", I think. But the
thing is, the interactive one is incompatible with other things like
"-i" and "-o". Use of the '|' alternative notation to express
things are mutually incompatible inherently does not play well with
the idea of showing common things early. It would allow us to group
conceptually similar things together, though.
Do we want to say "[-a | -i | -o | --interactive | --patch]" in the
same [] group and show them as alternatives? That may logically
make some sense, and if we were to go that route, it belongs near
the end of the list, close to where we show pathspec. I dunno.
next prev parent reply other threads:[~2020-09-22 16:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 13:30 [PATCH 0/3] commit: add an option to reword the last commit Phillip Wood via GitGitGadget
2020-09-21 13:30 ` [PATCH 1/3] commit docs: use backquotes when quoting options Phillip Wood via GitGitGadget
2020-09-21 13:30 ` [PATCH 2/3] commit: reorder synopsis Phillip Wood via GitGitGadget
2020-09-22 5:27 ` Junio C Hamano
2020-09-22 13:27 ` Phillip Wood
2020-09-22 16:16 ` Junio C Hamano [this message]
2020-09-21 13:30 ` [PATCH 3/3] commit: add an option the reword HEAD Phillip Wood via GitGitGadget
2020-09-21 15:43 ` Eric Sunshine
2020-09-21 18:05 ` Phillip Wood
2020-09-21 18:12 ` Eric Sunshine
2020-09-21 19:27 ` Junio C Hamano
2020-09-22 13:38 ` Phillip Wood
2020-09-22 16:54 ` Junio C Hamano
2020-09-21 17:04 ` Christian Couder
2020-09-21 18:01 ` Phillip Wood
2020-09-23 10:22 ` Johannes Schindelin
2020-09-23 18:23 ` Phillip Wood
2020-09-23 20:42 ` Johannes Schindelin
2020-09-24 9:58 ` Phillip Wood
2020-09-24 16:58 ` Junio C Hamano
2020-09-21 16:15 ` [PATCH 0/3] commit: add an option to reword the last commit Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeemtlrc9.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).