diff options
| author | James Liu <james@jamesliu.io> | 2024-05-03 17:17:04 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-03 10:32:06 -0700 |
| commit | 9b715ad92609f9b4ad12fa76ac649954ccdd119a (patch) | |
| tree | abdac5564f630b0b68a618f85128c679528bda70 | |
| parent | d4cc1ec35f3bcce816b69986ca41943f6ce21377 (diff) | |
| download | git-9b715ad92609f9b4ad12fa76ac649954ccdd119a.tar.gz | |
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>
| -rw-r--r-- | Documentation/git.txt | 14 | ||||
| -rw-r--r-- | git.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 7a1b112a3e..7fa75350b2 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -11,9 +11,9 @@ SYNOPSIS [verse] 'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path] - [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare] - [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>] - [--config-env=<name>=<envvar>] <command> [<args>] + [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--no-lazy-fetch] + [--no-optional-locks] [--bare] [--git-dir=<path>] [--work-tree=<path>] + [--namespace=<name>] [--config-env=<name>=<envvar>] <command> [<args>] DESCRIPTION ----------- @@ -186,6 +186,10 @@ If you just want to run git as if it was started in `<path>` then use This is equivalent to setting the `GIT_NO_LAZY_FETCH` environment variable to `1`. +--no-optional-locks:: + Do not perform optional operations that require locks. This is + equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`. + --literal-pathspecs:: Treat pathspecs literally (i.e. no globbing, no pathspec magic). 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 Add "icase" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`. ---no-optional-locks:: - Do not perform optional operations that require locks. This is - equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`. - --list-cmds=<group>[,<group>...]:: List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported @@ -36,9 +36,9 @@ struct cmd_struct { const char git_usage_string[] = N_("git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" - " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" - " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" - " [--config-env=<name>=<envvar>] <command> [<args>]"); + " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n" + " [--no-optional-locks] [--bare] [--git-dir=<path>] [--work-tree=<path>]\n" + " [--namespace=<name>] [--config-env=<name>=<envvar>] <command> [<args>]"); const char git_more_info_string[] = N_("'git help -a' and 'git help -g' list available subcommands and some\n" |