Merge branch 'sn/doc-opt-notation' into maint

* sn/doc-opt-notation:
  Fix {update,checkout}-index usage strings
  Put a space between `<' and argument in pack-objects usage string
  Remove stray quotes in --pretty and --format documentation
  Use parentheses and `...' where appropriate
  Fix odd markup in --diff-filter documentation
  Use angles for placeholders consistently
This commit is contained in:
Junio C Hamano 2010-10-21 16:26:42 -07:00
commit f7bff60de9
55 changed files with 157 additions and 157 deletions

View File

@ -48,9 +48,9 @@ endif::git-format-patch[]
--patience:: --patience::
Generate a diff using the "patience diff" algorithm. Generate a diff using the "patience diff" algorithm.
--stat[=width[,name-width]]:: --stat[=<width>[,<name-width>]]::
Generate a diffstat. You can override the default Generate a diffstat. You can override the default
output width for 80-column terminal by `--stat=width`. output width for 80-column terminal by `--stat=<width>`.
The width of the filename part can be controlled by The width of the filename part can be controlled by
giving another width to it separated by a comma. giving another width to it separated by a comma.
@ -66,14 +66,14 @@ endif::git-format-patch[]
number of modified files, as well as number of added and deleted number of modified files, as well as number of added and deleted
lines. lines.
--dirstat[=limit]:: --dirstat[=<limit>]::
Output the distribution of relative amount of changes (number of lines added or Output the distribution of relative amount of changes (number of lines added or
removed) for each sub-directory. Directories with changes below removed) for each sub-directory. Directories with changes below
a cut-off percent (3% by default) are not shown. The cut-off percent a cut-off percent (3% by default) are not shown. The cut-off percent
can be set with `--dirstat=limit`. Changes in a child directory is not can be set with `--dirstat=<limit>`. Changes in a child directory are not
counted for the parent directory, unless `--cumulative` is used. counted for the parent directory, unless `--cumulative` is used.
--dirstat-by-file[=limit]:: --dirstat-by-file[=<limit>]::
Same as `--dirstat`, but counts changed files instead of lines. Same as `--dirstat`, but counts changed files instead of lines.
--summary:: --summary::
@ -248,13 +248,13 @@ endif::git-log[]
If `n` is specified, it has the same meaning as for `-M<n>`. If `n` is specified, it has the same meaning as for `-M<n>`.
ifndef::git-format-patch[] ifndef::git-format-patch[]
--diff-filter=[ACDMRTUXB*]:: --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
Select only files that are Added (`A`), Copied (`C`), Select only files that are Added (`A`), Copied (`C`),
Deleted (`D`), Modified (`M`), Renamed (`R`), have their Deleted (`D`), Modified (`M`), Renamed (`R`), have their
type (i.e. regular file, symlink, submodule, ...) changed (`T`), type (i.e. regular file, symlink, submodule, ...) changed (`T`),
are Unmerged (`U`), are are Unmerged (`U`), are
Unknown (`X`), or have had their pairing Broken (`B`). Unknown (`X`), or have had their pairing Broken (`B`).
Any combination of the filter characters may be used. Any combination of the filter characters (including none) can be used.
When `*` (All-or-none) is added to the combination, all When `*` (All-or-none) is added to the combination, all
paths are selected if there is any file that matches paths are selected if there is any file that matches
other criteria in the comparison; if there is no file other criteria in the comparison; if there is no file

View File

@ -14,7 +14,7 @@ SYNOPSIS
[--ignore-date] [--ignore-space-change | --ignore-whitespace] [--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors | --no-scissors] [--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>...] [(<mbox> | <Maildir>)...]
'git am' (--continue | --skip | --abort) 'git am' (--continue | --skip | --abort)
DESCRIPTION DESCRIPTION
@ -25,7 +25,7 @@ current branch.
OPTIONS OPTIONS
------- -------
<mbox>|<Maildir>...:: (<mbox>|<Maildir>)...::
The list of mailbox files to read patches from. If you do not The list of mailbox files to read patches from. If you do not
supply this argument, the command reads from the standard input. supply this argument, the command reads from the standard input.
If you supply directories, they will be treated as Maildirs. If you supply directories, they will be treated as Maildirs.

View File

@ -12,10 +12,10 @@ SYNOPSIS
'git apply' [--stat] [--numstat] [--summary] [--check] [--index] 'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z] [--allow-binary-replacement | --binary] [--reject] [-z]
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
[--ignore-space-change | --ignore-whitespace ] [--ignore-space-change | --ignore-whitespace ]
[--whitespace=<nowarn|warn|fix|error|error-all>] [--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=PATH] [--include=PATH] [--directory=<root>] [--exclude=<path>] [--include=<path>] [--directory=<root>]
[--verbose] [<patch>...] [--verbose] [<patch>...]
DESCRIPTION DESCRIPTION

View File

@ -12,7 +12,7 @@ SYNOPSIS
'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>] 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
[-o | --output=<file>] [--worktree-attributes] [-o | --output=<file>] [--worktree-attributes]
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
[path...] [<path>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -73,7 +73,7 @@ OPTIONS
<tree-ish>:: <tree-ish>::
The tree or commit to produce an archive for. The tree or commit to produce an archive for.
path:: <path>::
Without an optional path parameter, all files and subdirectories Without an optional path parameter, all files and subdirectories
of the current working directory are included in the archive. of the current working directory are included in the archive.
If one or more paths are specified, only these are included. If one or more paths are specified, only these are included.

View File

@ -11,8 +11,8 @@ SYNOPSIS
[verse] [verse]
'git bundle' create <file> <git-rev-list-args> 'git bundle' create <file> <git-rev-list-args>
'git bundle' verify <file> 'git bundle' verify <file>
'git bundle' list-heads <file> [refname...] 'git bundle' list-heads <file> [<refname>...]
'git bundle' unbundle <file> [refname...] 'git bundle' unbundle <file> [<refname>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -68,7 +68,7 @@ unbundle <file>::
packaged. packaged.
[refname...]:: [<refname>...]::
A list of references used to limit the references reported as A list of references used to limit the references reported as
available. This is principally of use to 'git fetch', which available. This is principally of use to 'git fetch', which
expects to receive only those references asked for and not expects to receive only those references asked for and not

View File

@ -13,7 +13,7 @@ SYNOPSIS
[--stage=<number>|all] [--stage=<number>|all]
[--temp] [--temp]
[-z] [--stdin] [-z] [--stdin]
[--] [<file>]* [--] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -8,7 +8,7 @@ git-commit-tree - Create a new commit object
SYNOPSIS SYNOPSIS
-------- --------
'git commit-tree' <tree> [-p <parent commit>]* < changelog 'git commit-tree' <tree> [(-p <parent commit>)...] < changelog
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -9,15 +9,15 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git daemon' [--verbose] [--syslog] [--export-all] 'git daemon' [--verbose] [--syslog] [--export-all]
[--timeout=n] [--init-timeout=n] [--max-connections=n] [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]
[--strict-paths] [--base-path=path] [--base-path-relaxed] [--strict-paths] [--base-path=<path>] [--base-path-relaxed]
[--user-path | --user-path=path] [--user-path | --user-path=<path>]
[--interpolated-path=pathtemplate] [--interpolated-path=<pathtemplate>]
[--reuseaddr] [--detach] [--pid-file=file] [--reuseaddr] [--detach] [--pid-file=<file>]
[--enable=service] [--disable=service] [--enable=<service>] [--disable=<service>]
[--allow-override=service] [--forbid-override=service] [--allow-override=<service>] [--forbid-override=<service>]
[--inetd | [--listen=host_or_ipaddr] [--port=n] [--user=user [--group=group]] [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]
[directory...] [<directory>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -48,7 +48,7 @@ OPTIONS
'git daemon' will refuse to start when this option is enabled and no 'git daemon' will refuse to start when this option is enabled and no
whitelist is specified. whitelist is specified.
--base-path=path:: --base-path=<path>::
Remap all the path requests as relative to the given path. Remap all the path requests as relative to the given path.
This is sort of "GIT root" - if you run 'git daemon' with This is sort of "GIT root" - if you run 'git daemon' with
'--base-path=/srv/git' on example.com, then if you later try to pull '--base-path=/srv/git' on example.com, then if you later try to pull
@ -61,7 +61,7 @@ OPTIONS
This is useful for switching to --base-path usage, while still This is useful for switching to --base-path usage, while still
allowing the old paths. allowing the old paths.
--interpolated-path=pathtemplate:: --interpolated-path=<pathtemplate>::
To support virtual hosting, an interpolated path template can be To support virtual hosting, an interpolated path template can be
used to dynamically construct alternate paths. The template used to dynamically construct alternate paths. The template
supports %H for the target hostname as supplied by the client but supports %H for the target hostname as supplied by the client but
@ -80,27 +80,27 @@ OPTIONS
Have the server run as an inetd service. Implies --syslog. Have the server run as an inetd service. Implies --syslog.
Incompatible with --port, --listen, --user and --group options. Incompatible with --port, --listen, --user and --group options.
--listen=host_or_ipaddr:: --listen=<host_or_ipaddr>::
Listen on a specific IP address or hostname. IP addresses can Listen on a specific IP address or hostname. IP addresses can
be either an IPv4 address or an IPv6 address if supported. If IPv6 be either an IPv4 address or an IPv6 address if supported. If IPv6
is not supported, then --listen=hostname is also not supported and is not supported, then --listen=hostname is also not supported and
--listen must be given an IPv4 address. --listen must be given an IPv4 address.
Incompatible with '--inetd' option. Incompatible with '--inetd' option.
--port=n:: --port=<n>::
Listen on an alternative port. Incompatible with '--inetd' option. Listen on an alternative port. Incompatible with '--inetd' option.
--init-timeout=n:: --init-timeout=<n>::
Timeout between the moment the connection is established and the Timeout between the moment the connection is established and the
client request is received (typically a rather low value, since client request is received (typically a rather low value, since
that should be basically immediate). that should be basically immediate).
--timeout=n:: --timeout=<n>::
Timeout for specific client sub-requests. This includes the time Timeout for specific client sub-requests. This includes the time
it takes for the server to process the sub-request and the time spent it takes for the server to process the sub-request and the time spent
waiting for the next client's request. waiting for the next client's request.
--max-connections=n:: --max-connections=<n>::
Maximum number of concurrent clients, defaults to 32. Set it to Maximum number of concurrent clients, defaults to 32. Set it to
zero for no limit. zero for no limit.
@ -109,7 +109,7 @@ OPTIONS
--verbose, thus by default only error conditions will be logged. --verbose, thus by default only error conditions will be logged.
--user-path:: --user-path::
--user-path=path:: --user-path=<path>::
Allow {tilde}user notation to be used in requests. When Allow {tilde}user notation to be used in requests. When
specified with no parameter, requests to specified with no parameter, requests to
git://host/{tilde}alice/foo is taken as a request to access git://host/{tilde}alice/foo is taken as a request to access
@ -129,12 +129,12 @@ OPTIONS
--detach:: --detach::
Detach from the shell. Implies --syslog. Detach from the shell. Implies --syslog.
--pid-file=file:: --pid-file=<file>::
Save the process id in 'file'. Ignored when the daemon Save the process id in 'file'. Ignored when the daemon
is run under `--inetd`. is run under `--inetd`.
--user=user:: --user=<user>::
--group=group:: --group=<group>::
Change daemon's uid and gid before entering the service loop. Change daemon's uid and gid before entering the service loop.
When only `--user` is given without `--group`, the When only `--user` is given without `--group`, the
primary group ID for the user is used. The values of primary group ID for the user is used. The values of
@ -145,16 +145,16 @@ Giving these options is an error when used with `--inetd`; use
the facility of inet daemon to achieve the same before spawning the facility of inet daemon to achieve the same before spawning
'git daemon' if needed. 'git daemon' if needed.
--enable=service:: --enable=<service>::
--disable=service:: --disable=<service>::
Enable/disable the service site-wide per default. Note Enable/disable the service site-wide per default. Note
that a service disabled site-wide can still be enabled that a service disabled site-wide can still be enabled
per repository if it is marked overridable and the per repository if it is marked overridable and the
repository enables the service with a configuration repository enables the service with a configuration
item. item.
--allow-override=service:: --allow-override=<service>::
--forbid-override=service:: --forbid-override=<service>::
Allow/forbid overriding the site-wide default with per Allow/forbid overriding the site-wide default with per
repository configuration. By default, all the services repository configuration. By default, all the services
are overridable. are overridable.

View File

@ -96,7 +96,7 @@ marks the same across runs.
in the commit (as opposed to just listing the files which are in the commit (as opposed to just listing the files which are
different from the commit's first parent). different from the commit's first parent).
[git-rev-list-args...]:: [<git-rev-list-args>...]::
A list of arguments, acceptable to 'git rev-parse' and A list of arguments, acceptable to 'git rev-parse' and
'git rev-list', that specifies the specific objects and references 'git rev-list', that specifies the specific objects and references
to export. For example, `master{tilde}10..master` causes the to export. For example, `master{tilde}10..master` causes the

View File

@ -12,7 +12,7 @@ SYNOPSIS
'git fetch' [<options>] <group> 'git fetch' [<options>] <group>
'git fetch' --multiple [<options>] [<repository> | <group>]... 'git fetch' --multiple [<options>] [(<repository> | <group>)...]
'git fetch' --all [<options>] 'git fetch' --all [<options>]

View File

@ -117,7 +117,7 @@ OPTIONS
This is the filter for performing the commit. This is the filter for performing the commit.
If this filter is specified, it will be called instead of the If this filter is specified, it will be called instead of the
'git commit-tree' command, with arguments of the form 'git commit-tree' command, with arguments of the form
"<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on "<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]" and the log message on
stdin. The commit id is expected on stdout. stdin. The commit id is expected on stdout.
+ +
As a special extension, the commit filter may emit multiple As a special extension, the commit filter may emit multiple

View File

@ -9,7 +9,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl] 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
[--sort=<key>]* [--format=<format>] [<pattern>...] [(--sort=<key>)...] [--format=<format>] [<pattern>...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -59,10 +59,10 @@ OPTIONS
the newly constructed pack and index before refs can be the newly constructed pack and index before refs can be
updated to use objects contained in the pack. updated to use objects contained in the pack.
--keep='why':: --keep=<msg>::
Like --keep create a .keep file before moving the index into Like --keep create a .keep file before moving the index into
its final destination, but rather than creating an empty file its final destination, but rather than creating an empty file
place 'why' followed by an LF into the .keep file. The 'why' place '<msg>' followed by an LF into the .keep file. The '<msg>'
message can later be searched for within all .keep files to message can later be searched for within all .keep files to
locate any which have outlived their usefulness. locate any which have outlived their usefulness.

View File

@ -31,7 +31,7 @@ current working directory.
Specify the directory from which templates will be used. (See the "TEMPLATE Specify the directory from which templates will be used. (See the "TEMPLATE
DIRECTORY" section below.) DIRECTORY" section below.)
--shared[={false|true|umask|group|all|world|everybody|0xxx}]:: --shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
Specify that the git repository is to be shared amongst several users. This Specify that the git repository is to be shared amongst several users. This
allows users belonging to the same group to push into that allows users belonging to the same group to push into that

View File

@ -17,7 +17,7 @@ SYNOPSIS
[--exclude-per-directory=<file>] [--exclude-per-directory=<file>]
[--exclude-standard] [--exclude-standard]
[--error-unmatch] [--with-tree=<tree-ish>] [--error-unmatch] [--with-tree=<tree-ish>]
[--full-name] [--abbrev] [--] [<file>]* [--full-name] [--abbrev] [--] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -10,8 +10,8 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git ls-tree' [-d] [-r] [-t] [-l] [-z] 'git ls-tree' [-d] [-r] [-t] [-l] [-z]
[--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev=[<n>]] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]
<tree-ish> [paths...] <tree-ish> [<path>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -19,11 +19,11 @@ Lists the contents of a given tree object, like what "/bin/ls -a" does
in the current working directory. Note that: in the current working directory. Note that:
- the behaviour is slightly different from that of "/bin/ls" in that the - the behaviour is slightly different from that of "/bin/ls" in that the
'paths' denote just a list of patterns to match, e.g. so specifying '<path>' denotes just a list of patterns to match, e.g. so specifying
directory name (without '-r') will behave differently, and order of the directory name (without '-r') will behave differently, and order of the
arguments does not matter. arguments does not matter.
- the behaviour is similar to that of "/bin/ls" in that the 'paths' is - the behaviour is similar to that of "/bin/ls" in that the '<path>' is
taken as relative to the current working directory. E.g. when you are taken as relative to the current working directory. E.g. when you are
in a directory 'sub' that has a directory 'dir', you can run 'git in a directory 'sub' that has a directory 'dir', you can run 'git
ls-tree -r HEAD dir' to list the contents of the tree (that is ls-tree -r HEAD dir' to list the contents of the tree (that is
@ -72,7 +72,7 @@ OPTIONS
Do not limit the listing to the current working directory. Do not limit the listing to the current working directory.
Implies --full-name. Implies --full-name.
paths:: [<path>...]::
When paths are given, show them (note that this isn't really raw When paths are given, show them (note that this isn't really raw
pathnames, but rather a list of patterns to match). Otherwise pathnames, but rather a list of patterns to match). Otherwise
implicitly uses the root level of the tree as the sole path argument. implicitly uses the root level of the tree as the sole path argument.

View File

@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program
SYNOPSIS SYNOPSIS
-------- --------
'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [<mbox>|<Maildir>...] 'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [(<mbox>|<Maildir>)...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS SYNOPSIS
-------- --------
'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]... 'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -11,8 +11,8 @@ SYNOPSIS
[verse] [verse]
'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied] 'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]
[--no-reuse-delta] [--delta-base-offset] [--non-empty] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
[--local] [--incremental] [--window=N] [--depth=N] [--local] [--incremental] [--window=<n>] [--depth=<n>]
[--revs [--unpacked | --all]*] [--stdout | base-name] [--revs [--unpacked | --all]] [--stdout | base-name]
[--keep-true-parents] < object-list [--keep-true-parents] < object-list
@ -82,8 +82,8 @@ base-name::
reference was included in the resulting packfile. This reference was included in the resulting packfile. This
can be useful to send new tags to native git clients. can be useful to send new tags to native git clients.
--window=[N]:: --window=<n>::
--depth=[N]:: --depth=<n>::
These two options affect how the objects contained in These two options affect how the objects contained in
the pack are stored using delta compression. The the pack are stored using delta compression. The
objects are first internally sorted by type, size and objects are first internally sorted by type, size and
@ -95,10 +95,10 @@ base-name::
times to get to the necessary object. times to get to the necessary object.
The default value for --window is 10 and --depth is 50. The default value for --window is 10 and --depth is 50.
--window-memory=[N]:: --window-memory=<n>::
This option provides an additional limit on top of `--window`; This option provides an additional limit on top of `--window`;
the window size will dynamically scale down so as to not take the window size will dynamically scale down so as to not take
up more than N bytes in memory. This is useful in up more than '<n>' bytes in memory. This is useful in
repositories with a mix of large and small objects to not run repositories with a mix of large and small objects to not run
out of memory with a large window, but still be able to take out of memory with a large window, but still be able to take
advantage of the large window for the smaller objects. The advantage of the large window for the smaller objects. The
@ -106,7 +106,7 @@ base-name::
`--window-memory=0` makes memory usage unlimited, which is the `--window-memory=0` makes memory usage unlimited, which is the
default. default.
--max-pack-size=[N]:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB. "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
If specified, multiple packfiles may be created. If specified, multiple packfiles may be created.
@ -171,7 +171,7 @@ base-name::
wholesale enforcement of a different compression level on the wholesale enforcement of a different compression level on the
packed data is desired. packed data is desired.
--compression=[N]:: --compression=<n>::
Specifies compression level for newly-compressed data in the Specifies compression level for newly-compressed data in the
generated pack. If not specified, pack compression level is generated pack. If not specified, pack compression level is
determined first by pack.compression, then by core.compression, determined first by pack.compression, then by core.compression,

View File

@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories
SYNOPSIS SYNOPSIS
-------- --------
'git relink' [--safe] <dir> [<dir>]* <master_dir> 'git relink' [--safe] <dir>... <master_dir>
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -20,7 +20,7 @@ SYNOPSIS
'git remote set-url --delete' [--push] <name> <url> 'git remote set-url --delete' [--push] <name> <url>
'git remote' [-v | --verbose] 'show' [-n] <name> 'git remote' [-v | --verbose] 'show' [-n] <name>
'git remote prune' [-n | --dry-run] <name> 'git remote prune' [-n | --dry-run] <name>
'git remote' [-v | --verbose] 'update' [-p | --prune] [group | remote]... 'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository
SYNOPSIS SYNOPSIS
-------- --------
'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] 'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
DESCRIPTION DESCRIPTION
----------- -----------
@ -76,8 +76,8 @@ other objects in that pack they already have locally.
this repository (or a direct copy of it) this repository (or a direct copy of it)
over HTTP or FTP. See linkgit:git-update-server-info[1]. over HTTP or FTP. See linkgit:git-update-server-info[1].
--window=[N]:: --window=<n>::
--depth=[N]:: --depth=<n>::
These two options affect how the objects contained in the pack are These two options affect how the objects contained in the pack are
stored using delta compression. The objects are first internally stored using delta compression. The objects are first internally
sorted by type, size and optionally names and compared against the sorted by type, size and optionally names and compared against the
@ -87,10 +87,10 @@ other objects in that pack they already have locally.
to be applied that many times to get to the necessary object. to be applied that many times to get to the necessary object.
The default value for --window is 10 and --depth is 50. The default value for --window is 10 and --depth is 50.
--window-memory=[N]:: --window-memory=<n>::
This option provides an additional limit on top of `--window`; This option provides an additional limit on top of `--window`;
the window size will dynamically scale down so as to not take the window size will dynamically scale down so as to not take
up more than N bytes in memory. This is useful in up more than '<n>' bytes in memory. This is useful in
repositories with a mix of large and small objects to not run repositories with a mix of large and small objects to not run
out of memory with a large window, but still be able to take out of memory with a large window, but still be able to take
advantage of the large window for the smaller objects. The advantage of the large window for the smaller objects. The
@ -98,7 +98,7 @@ other objects in that pack they already have locally.
`--window-memory=0` makes memory usage unlimited, which is the `--window-memory=0` makes memory usage unlimited, which is the
default. default.
--max-pack-size=[N]:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB. "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
If specified, multiple packfiles may be created. If specified, multiple packfiles may be created.

View File

@ -9,10 +9,10 @@ git-rev-list - Lists commit objects in reverse chronological order
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git rev-list' [ \--max-count=number ] 'git rev-list' [ \--max-count=<number> ]
[ \--skip=number ] [ \--skip=<number> ]
[ \--max-age=timestamp ] [ \--max-age=<timestamp> ]
[ \--min-age=timestamp ] [ \--min-age=<timestamp> ]
[ \--sparse ] [ \--sparse ]
[ \--merges ] [ \--merges ]
[ \--no-merges ] [ \--no-merges ]
@ -21,10 +21,10 @@ SYNOPSIS
[ \--full-history ] [ \--full-history ]
[ \--not ] [ \--not ]
[ \--all ] [ \--all ]
[ \--branches[=pattern] ] [ \--branches[=<pattern>] ]
[ \--tags[=pattern] ] [ \--tags[=<pattern>] ]
[ \--remotes[=pattern] ] [ \--remotes[=<pattern>] ]
[ \--glob=glob-pattern ] [ \--glob=<glob-pattern> ]
[ \--stdin ] [ \--stdin ]
[ \--quiet ] [ \--quiet ]
[ \--topo-order ] [ \--topo-order ]
@ -37,7 +37,7 @@ SYNOPSIS
[ \--regexp-ignore-case | -i ] [ \--regexp-ignore-case | -i ]
[ \--extended-regexp | -E ] [ \--extended-regexp | -E ]
[ \--fixed-strings | -F ] [ \--fixed-strings | -F ]
[ \--date={local|relative|default|iso|rfc|short} ] [ \--date=(local|relative|default|iso|rfc|short) ]
[ [\--objects | \--objects-edge] [ \--unpacked ] ] [ [\--objects | \--objects-edge] [ \--unpacked ] ]
[ \--pretty | \--header ] [ \--pretty | \--header ]
[ \--bisect ] [ \--bisect ]

View File

@ -95,7 +95,7 @@ OPTIONS
unfortunately named tag "master"), and show them as full unfortunately named tag "master"), and show them as full
refnames (e.g. "refs/heads/master"). refnames (e.g. "refs/heads/master").
--abbrev-ref[={strict|loose}]:: --abbrev-ref[=(strict|loose)]::
A non-ambiguous short name of the objects name. A non-ambiguous short name of the objects name.
The option core.warnAmbiguousRefs is used to select the strict The option core.warnAmbiguousRefs is used to select the strict
abbreviation mode. abbreviation mode.

View File

@ -44,7 +44,7 @@ OPTIONS
--email:: --email::
Show the email address of each author. Show the email address of each author.
--format[='<format>']:: --format[=<format>]::
Instead of the commit subject, use some other information to Instead of the commit subject, use some other information to
describe each commit. '<format>' can be any string accepted describe each commit. '<format>' can be any string accepted
by the `--format` option of 'git log', such as '{asterisk} [%h] %s'. by the `--format` option of 'git log', such as '{asterisk} [%h] %s'.

View File

@ -12,7 +12,7 @@ SYNOPSIS
[--current] [--color[=<when>] | --no-color] [--sparse] [--current] [--color[=<when>] | --no-color] [--sparse]
[--more=<n> | --list | --independent | --merge-base] [--more=<n> | --list | --independent | --merge-base]
[--no-name | --sha1-name] [--topics] [--no-name | --sha1-name] [--topics]
[<rev> | <glob>]... [(<rev> | <glob>)...]
'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>] 'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]

View File

@ -438,7 +438,7 @@ git rebase --onto remotes/git-svn A^ master
OPTIONS OPTIONS
------- -------
--shared[={false|true|umask|group|all|world|everybody}]:: --shared[=(false|true|umask|group|all|world|everybody)]::
--template=<template_directory>:: --template=<template_directory>::
Only used with the 'init' command. Only used with the 'init' command.
These are passed directly to 'git init'. These are passed directly to 'git init'.

View File

@ -12,7 +12,7 @@ SYNOPSIS
'git update-index' 'git update-index'
[--add] [--remove | --force-remove] [--replace] [--add] [--remove | --force-remove] [--replace]
[--refresh] [-q] [--unmerged] [--ignore-missing] [--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo <mode> <object> <file>]* [(--cacheinfo <mode> <object> <file>)...]
[--chmod=(+|-)x] [--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged] [--assume-unchanged | --no-assume-unchanged]
[--skip-worktree | --no-skip-worktree] [--skip-worktree | --no-skip-worktree]
@ -21,7 +21,7 @@ SYNOPSIS
[--info-only] [--index-info] [--info-only] [--index-info]
[-z] [--stdin] [-z] [--stdin]
[--verbose] [--verbose]
[--] [<file>]* [--] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -32,19 +32,19 @@ Custom commands may also be specified.
OPTIONS OPTIONS
------- -------
-b BROWSER:: -b <browser>::
--browser=BROWSER:: --browser=<browser>::
Use the specified BROWSER. It must be in the list of supported Use the specified browser. It must be in the list of supported
browsers. browsers.
-t BROWSER:: -t <browser>::
--tool=BROWSER:: --tool=<browser>::
Same as above. Same as above.
-c CONF.VAR:: -c <conf.var>::
--config=CONF.VAR:: --config=<conf.var>::
CONF.VAR is looked up in the git config files. If it's set, CONF.VAR is looked up in the git config files. If it's set,
then its value specify the browser that should be used. then its value specifies the browser that should be used.
CONFIGURATION VARIABLES CONFIGURATION VARIABLES
----------------------- -----------------------

View File

@ -9,11 +9,11 @@ git - the stupid content tracker
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] 'git' [--version] [--exec-path[=<path>]] [--html-path]
[-p|--paginate|--no-pager] [--no-replace-objects] [-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--bare] [--git-dir=<path>] [--work-tree=<path>]
[-c name=value] [-c <name>=<value>]
[--help] COMMAND [ARGS] [--help] <command> [<args>]
DESCRIPTION DESCRIPTION
----------- -----------
@ -28,7 +28,7 @@ also want to read linkgit:gitcvs-migration[7]. See
the link:user-manual.html[Git User's Manual] for a more in-depth the link:user-manual.html[Git User's Manual] for a more in-depth
introduction. introduction.
The COMMAND is either a name of a Git command (see below) or an alias The '<command>' is either a name of a Git command (see below) or an alias
as defined in the configuration file (see linkgit:git-config[1]). as defined in the configuration file (see linkgit:git-config[1]).
Formatted and hyperlinked version of the latest git Formatted and hyperlinked version of the latest git
@ -252,7 +252,7 @@ help ...`.
The <name> is expected in the same format as listed by The <name> is expected in the same format as listed by
'git config' (subkeys separated by dots). 'git config' (subkeys separated by dots).
--exec-path:: --exec-path[=<path>]::
Path to wherever your core git programs are installed. Path to wherever your core git programs are installed.
This can also be controlled by setting the GIT_EXEC_PATH This can also be controlled by setting the GIT_EXEC_PATH
environment variable. If no path is given, 'git' will print environment variable. If no path is given, 'git' will print

View File

@ -52,7 +52,7 @@ no-renormalize;;
Disables the `renormalize` option. This overrides the Disables the `renormalize` option. This overrides the
`merge.renormalize` configuration variable. `merge.renormalize` configuration variable.
subtree[=path];; subtree[=<path>];;
This option is a more advanced form of 'subtree' strategy, where This option is a more advanced form of 'subtree' strategy, where
the strategy makes a guess on how two trees must be shifted to the strategy makes a guess on how two trees must be shifted to
match with each other when merging. Instead, the specified path match with each other when merging. Instead, the specified path

View File

@ -1,5 +1,5 @@
--pretty[='<format>']:: --pretty[=<format>]::
--format='<format>':: --format=<format>::
Pretty-print the contents of the commit logs in a given format, Pretty-print the contents of the commit logs in a given format,
where '<format>' can be one of 'oneline', 'short', 'medium', where '<format>' can be one of 'oneline', 'short', 'medium',

View File

@ -13,7 +13,7 @@ include::pretty-options.txt[]
Synonym for `--date=relative`. Synonym for `--date=relative`.
--date={relative,local,default,iso,rfc,short,raw}:: --date=(relative|local|default|iso|rfc|short|raw)::
Only takes effect for dates shown in human-readable format, such Only takes effect for dates shown in human-readable format, such
as when using "--pretty". `log.date` config variable sets a default as when using "--pretty". `log.date` config variable sets a default
@ -246,29 +246,29 @@ endif::git-rev-list[]
Pretend as if all the refs in `refs/` are listed on the Pretend as if all the refs in `refs/` are listed on the
command line as '<commit>'. command line as '<commit>'.
--branches[=pattern]:: --branches[=<pattern>]::
Pretend as if all the refs in `refs/heads` are listed Pretend as if all the refs in `refs/heads` are listed
on the command line as '<commit>'. If `pattern` is given, limit on the command line as '<commit>'. If '<pattern>' is given, limit
branches to ones matching given shell glob. If pattern lacks '?', branches to ones matching given shell glob. If pattern lacks '?',
'*', or '[', '/*' at the end is implied. '*', or '[', '/*' at the end is implied.
--tags[=pattern]:: --tags[=<pattern>]::
Pretend as if all the refs in `refs/tags` are listed Pretend as if all the refs in `refs/tags` are listed
on the command line as '<commit>'. If `pattern` is given, limit on the command line as '<commit>'. If '<pattern>' is given, limit
tags to ones matching given shell glob. If pattern lacks '?', '*', tags to ones matching given shell glob. If pattern lacks '?', '*',
or '[', '/*' at the end is implied. or '[', '/*' at the end is implied.
--remotes[=pattern]:: --remotes[=<pattern>]::
Pretend as if all the refs in `refs/remotes` are listed Pretend as if all the refs in `refs/remotes` are listed
on the command line as '<commit>'. If `pattern`is given, limit on the command line as '<commit>'. If '<pattern>' is given, limit
remote tracking branches to ones matching given shell glob. remote tracking branches to ones matching given shell glob.
If pattern lacks '?', '*', or '[', '/*' at the end is implied. If pattern lacks '?', '*', or '[', '/*' at the end is implied.
--glob=glob-pattern:: --glob=<glob-pattern>::
Pretend as if all the refs matching shell glob `glob-pattern` Pretend as if all the refs matching shell glob '<glob-pattern>'
are listed on the command line as '<commit>'. Leading 'refs/', are listed on the command line as '<commit>'. Leading 'refs/',
is automatically prepended if missing. If pattern lacks '?', '*', is automatically prepended if missing. If pattern lacks '?', '*',
or '[', '/*' at the end is implied. or '[', '/*' at the end is implied.

View File

@ -3853,7 +3853,7 @@ You create a commit object by giving it the tree that describes the
state at the time of the commit, and a list of parents: state at the time of the commit, and a list of parents:
------------------------------------------------- -------------------------------------------------
$ git commit-tree <tree> -p <parent> [-p <parent2> ..] $ git commit-tree <tree> -p <parent> [(-p <parent2>)...]
------------------------------------------------- -------------------------------------------------
and then giving the reason for the commit on stdin (either through and then giving the reason for the commit on stdin (either through

View File

@ -7,9 +7,9 @@
#include "unpack-trees.h" #include "unpack-trees.h"
static char const * const archive_usage[] = { static char const * const archive_usage[] = {
"git archive [options] <tree-ish> [path...]", "git archive [options] <tree-ish> [<path>...]",
"git archive --list", "git archive --list",
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]", "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]",
"git archive --remote <repo> [--exec <cmd>] --list", "git archive --remote <repo> [--exec <cmd>] --list",
NULL NULL
}; };

View File

@ -12,8 +12,8 @@
static const char builtin_bundle_usage[] = static const char builtin_bundle_usage[] =
"git bundle create <file> <git-rev-list args>\n" "git bundle create <file> <git-rev-list args>\n"
" or: git bundle verify <file>\n" " or: git bundle verify <file>\n"
" or: git bundle list-heads <file> [refname...]\n" " or: git bundle list-heads <file> [<refname>...]\n"
" or: git bundle unbundle <file> [refname...]"; " or: git bundle unbundle <file> [<refname>...]";
int cmd_bundle(int argc, const char **argv, const char *prefix) int cmd_bundle(int argc, const char **argv, const char *prefix)
{ {

View File

@ -155,7 +155,7 @@ static void checkout_all(const char *prefix, int prefix_length)
} }
static const char * const builtin_checkout_index_usage[] = { static const char * const builtin_checkout_index_usage[] = {
"git checkout-index [options] [--] <file>...", "git checkout-index [options] [--] [<file>...]",
NULL NULL
}; };

View File

@ -9,7 +9,7 @@
#include "builtin.h" #include "builtin.h"
#include "utf8.h" #include "utf8.h"
static const char commit_tree_usage[] = "git commit-tree <sha1> [-p <sha1>]* < changelog"; static const char commit_tree_usage[] = "git commit-tree <sha1> [(-p <sha1>)...] < changelog";
static void new_parent(struct commit *parent, struct commit_list **parents_p) static void new_parent(struct commit *parent, struct commit_list **parents_p)
{ {

View File

@ -16,7 +16,7 @@
static const char * const builtin_fetch_usage[] = { static const char * const builtin_fetch_usage[] = {
"git fetch [<options>] [<repository> [<refspec>...]]", "git fetch [<options>] [<repository> [<refspec>...]]",
"git fetch [<options>] <group>", "git fetch [<options>] <group>",
"git fetch --multiple [<options>] [<repository> | <group>]...", "git fetch --multiple [<options>] [(<repository> | <group>)...]",
"git fetch --all [<options>]", "git fetch --all [<options>]",
NULL NULL
}; };

View File

@ -24,7 +24,7 @@
#endif #endif
static char const * const grep_usage[] = { static char const * const grep_usage[] = {
"git grep [options] [-e] <pattern> [<rev>...] [[--] path...]", "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]",
NULL NULL
}; };

View File

@ -11,7 +11,7 @@
#include "exec_cmd.h" #include "exec_cmd.h"
static const char index_pack_usage[] = static const char index_pack_usage[] =
"git index-pack [-v] [-o <index-file>] [{ --keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }"; "git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
struct object_entry struct object_entry
{ {

View File

@ -424,7 +424,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_
} }
static const char * const ls_files_usage[] = { static const char * const ls_files_usage[] = {
"git ls-files [options] [<file>]*", "git ls-files [options] [<file>...]",
NULL NULL
}; };

View File

@ -24,7 +24,7 @@ static int chomp_prefix;
static const char *ls_tree_prefix; static const char *ls_tree_prefix;
static const char * const ls_tree_usage[] = { static const char * const ls_tree_usage[] = {
"git ls-tree [<options>] <tree-ish> [path...]", "git ls-tree [<options>] <tree-ish> [<path>...]",
NULL NULL
}; };

View File

@ -10,7 +10,7 @@
#include "strbuf.h" #include "strbuf.h"
static const char git_mailsplit_usage[] = static const char git_mailsplit_usage[] =
"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]"; "git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";
static int is_from_line(const char *line, int len) static int is_from_line(const char *line, int len)
{ {

View File

@ -23,15 +23,15 @@
#endif #endif
static const char pack_usage[] = static const char pack_usage[] =
"git pack-objects [{ -q | --progress | --all-progress }]\n" "git pack-objects [ -q | --progress | --all-progress ]\n"
" [--all-progress-implied]\n" " [--all-progress-implied]\n"
" [--max-pack-size=N] [--local] [--incremental]\n" " [--max-pack-size=<n>] [--local] [--incremental]\n"
" [--window=N] [--window-memory=N] [--depth=N]\n" " [--window=<n>] [--window-memory=<n>] [--depth=<n>]\n"
" [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n" " [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n"
" [--threads=N] [--non-empty] [--revs [--unpacked | --all]*]\n" " [--threads=<n>] [--non-empty] [--revs [--unpacked | --all]]\n"
" [--reflog] [--stdout | base-name] [--include-tag]\n" " [--reflog] [--stdout | base-name] [--include-tag]\n"
" [--keep-unreachable | --unpack-unreachable]\n" " [--keep-unreachable | --unpack-unreachable]\n"
" [<ref-list | <object-list]"; " [< ref-list | < object-list]";
struct object_entry { struct object_entry {
struct pack_idx_entry idx; struct pack_idx_entry idx;

View File

@ -15,7 +15,7 @@ static const char * const builtin_remote_usage[] = {
"git remote set-head <name> (-a | -d | <branch>)", "git remote set-head <name> (-a | -d | <branch>)",
"git remote [-v | --verbose] show [-n] <name>", "git remote [-v | --verbose] show [-n] <name>",
"git remote prune [-n | --dry-run] <name>", "git remote prune [-n | --dry-run] <name>",
"git remote [-v | --verbose] update [-p | --prune] [group | remote]", "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
"git remote set-branches <name> [--add] <branch>...", "git remote set-branches <name> [--add] <branch>...",
"git remote set-url <name> <newurl> [<oldurl>]", "git remote set-url <name> <newurl> [<oldurl>]",
"git remote set-url --add <name> <newurl>", "git remote set-url --add <name> <newurl>",

View File

@ -11,9 +11,9 @@
static const char rev_list_usage[] = static const char rev_list_usage[] =
"git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
" limiting output:\n" " limiting output:\n"
" --max-count=nr\n" " --max-count=<n>\n"
" --max-age=epoch\n" " --max-age=<epoch>\n"
" --min-age=epoch\n" " --min-age=<epoch>\n"
" --sparse\n" " --sparse\n"
" --no-merges\n" " --no-merges\n"
" --remove-empty\n" " --remove-empty\n"
@ -33,7 +33,7 @@ static const char rev_list_usage[] =
" --objects | --objects-edge\n" " --objects | --objects-edge\n"
" --unpacked\n" " --unpacked\n"
" --header | --pretty\n" " --header | --pretty\n"
" --abbrev=nr | --no-abbrev\n" " --abbrev=<n> | --no-abbrev\n"
" --abbrev-commit\n" " --abbrev-commit\n"
" --left-right\n" " --left-right\n"
" special purpose:\n" " special purpose:\n"

View File

@ -6,7 +6,7 @@
#include "parse-options.h" #include "parse-options.h"
static const char* show_branch_usage[] = { static const char* show_branch_usage[] = {
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...", "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]",
"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]", "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",
NULL NULL
}; };

View File

@ -398,7 +398,7 @@ static void read_index_info(int line_termination)
} }
static const char update_index_usage[] = static const char update_index_usage[] =
"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>..."; "git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] [<file>...]";
static unsigned char head_sha1[20]; static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20]; static unsigned char merge_head_sha1[20];

View File

@ -20,15 +20,15 @@ static int reuseaddr;
static const char daemon_usage[] = static const char daemon_usage[] =
"git daemon [--verbose] [--syslog] [--export-all]\n" "git daemon [--verbose] [--syslog] [--export-all]\n"
" [--timeout=n] [--init-timeout=n] [--max-connections=n]\n" " [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
" [--strict-paths] [--base-path=path] [--base-path-relaxed]\n" " [--strict-paths] [--base-path=<path>] [--base-path-relaxed]\n"
" [--user-path | --user-path=path]\n" " [--user-path | --user-path=<path>]\n"
" [--interpolated-path=path]\n" " [--interpolated-path=<path>]\n"
" [--reuseaddr] [--detach] [--pid-file=file]\n" " [--reuseaddr] [--detach] [--pid-file=<file>]\n"
" [--[enable|disable|allow-override|forbid-override]=service]\n" " [--(enable|disable|allow-override|forbid-override)=<service>]\n"
" [--inetd | [--listen=host_or_ipaddr] [--port=n]\n" " [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>]\n"
" [--user=user [--group=group]]\n" " [--user=<user> [--group=<group>]]\n"
" [directory...]"; " [<directory>...]";
/* List of acceptable pathname prefixes */ /* List of acceptable pathname prefixes */
static char **ok_paths; static char **ok_paths;

View File

@ -2884,7 +2884,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)
} }
static const char fast_import_usage[] = static const char fast_import_usage[] =
"git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]"; "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
static void parse_argv(void) static void parse_argv(void)
{ {

View File

@ -5,7 +5,7 @@
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH= OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\ OPTIONS_SPEC="\
git am [options] [<mbox>|<Maildir>...] git am [options] [(<mbox>|<Maildir>)...]
git am [options] (--resolved | --skip | --abort) git am [options] (--resolved | --skip | --abort)
-- --
i,interactive run interactively i,interactive run interactively

View File

@ -163,7 +163,7 @@ sub link_two_files($$) {
sub usage() { sub usage() {
print("Usage: git relink [--safe] <dir> [<dir> ...] <master_dir> \n"); print("Usage: git relink [--safe] <dir>... <master_dir> \n");
print("All directories should contain a .git/objects/ subdirectory.\n"); print("All directories should contain a .git/objects/ subdirectory.\n");
print("Options\n"); print("Options\n");
print("\t--safe\t" . print("\t--safe\t" .

8
git.c
View File

@ -6,14 +6,14 @@
#include "run-command.h" #include "run-command.h"
const char git_usage_string[] = const char git_usage_string[] =
"git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]\n" "git [--version] [--exec-path[=<path>]] [--html-path]\n"
" [-p|--paginate|--no-pager] [--no-replace-objects]\n" " [-p|--paginate|--no-pager] [--no-replace-objects]\n"
" [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]\n" " [--bare] [--git-dir=<path>] [--work-tree=<path>]\n"
" [-c name=value] [--help]\n" " [-c name=value] [--help]\n"
" COMMAND [ARGS]"; " <command> [<args>]";
const char git_more_info_string[] = const char git_more_info_string[] =
"See 'git help COMMAND' for more information on a specific command."; "See 'git help <command>' for more information on a specific command.";
static struct startup_info git_startup_info; static struct startup_info git_startup_info;
static int use_pager = -1; static int use_pager = -1;

View File

@ -11,7 +11,7 @@
#include "list-objects.h" #include "list-objects.h"
#include "run-command.h" #include "run-command.h"
static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>"; static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
/* bits #0..7 in revision.h, #8..10 in commit.c */ /* bits #0..7 in revision.h, #8..10 in commit.c */
#define THEY_HAVE (1u << 11) #define THEY_HAVE (1u << 11)