doc: clean up usage documentation for --no-* opts

We'll be adding another option to the --no-* class of options soon. Clean up the existing options by grouping them together in the OPTIONS section, and adding missing ones to the SYNOPSIS. Signed-off-by: James Liu <james@jamesliu.io> Signed-off-by: Junio C Hamano <gitster@pobox.com>

James Liu committed May 3, 2024 at 17:17 UTC 9b715ad92609f9b4ad12fa76ac649954ccdd119a
2 files changed +10 -10
Documentation/git.txt
+7 -7
@@ -11,9 +11,9 @@ SYNOPSIS
11 [verse]
12 'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
13 [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
14 - [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
15 - [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
16 - [--config-env=<name>=<envvar>] <command> [<args>]
14 + [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--no-lazy-fetch]
15 + [--no-optional-locks] [--bare] [--git-dir=<path>] [--work-tree=<path>]
16 + [--namespace=<name>] [--config-env=<name>=<envvar>] <command> [<args>]
17
18 DESCRIPTION
19 -----------
@@ -186,6 +186,10 @@ If you just want to run git as if it was started in `<path>` then use
186 This is equivalent to setting the `GIT_NO_LAZY_FETCH`
187 environment variable to `1`.
188
189 +--no-optional-locks::
190 + Do not perform optional operations that require locks. This is
191 + equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`.
192 +
193 --literal-pathspecs::
194 Treat pathspecs literally (i.e. no globbing, no pathspec magic).
195 This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment
@@ -207,10 +211,6 @@ If you just want to run git as if it was started in `<path>` then use
211 Add "icase" magic to all pathspec. This is equivalent to setting
212 the `GIT_ICASE_PATHSPECS` environment variable to `1`.
213
210 ---no-optional-locks::
211 - Do not perform optional operations that require locks. This is
212 - equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`.
213 -
214 --list-cmds=<group>[,<group>...]::
215 List commands by group. This is an internal/experimental
216 option and may change or be removed in the future. Supported
git.c
+3 -3
@@ -36,9 +36,9 @@ struct cmd_struct {
36 const char git_usage_string[] =
37 N_("git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
38 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
39 - " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
40 - " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
41 - " [--config-env=<name>=<envvar>] <command> [<args>]");
39 + " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n"
40 + " [--no-optional-locks] [--bare] [--git-dir=<path>] [--work-tree=<path>]\n"
41 + " [--namespace=<name>] [--config-env=<name>=<envvar>] <command> [<args>]");
42
43 const char git_more_info_string[] =
44 N_("'git help -a' and 'git help -g' list available subcommands and some\n"