@matheusbsbs / matheus-bagliano / commits / 62b4698e55
Fork 0

Use angles for placeholders consistently

Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Štěpán Němec committed Oct 8, 2010 at 19:31 UTC 62b4698e551c29b3d2539a764ad0e93cfff53c03
27 files changed +118 -118
Documentation/diff-options.txt
+5 -5
@@ -48,9 +48,9 @@ endif::git-format-patch[]
48 --patience::
49 Generate a diff using the "patience diff" algorithm.
50
51 ---stat[=width[,name-width]]::
51 +--stat[=<width>[,<name-width>]]::
52 Generate a diffstat. You can override the default
53 - output width for 80-column terminal by `--stat=width`.
53 + output width for 80-column terminal by `--stat=<width>`.
54 The width of the filename part can be controlled by
55 giving another width to it separated by a comma.
56
@@ -66,14 +66,14 @@ endif::git-format-patch[]
66 number of modified files, as well as number of added and deleted
67 lines.
68
69 ---dirstat[=limit]::
69 +--dirstat[=<limit>]::
70 Output the distribution of relative amount of changes (number of lines added or
71 removed) for each sub-directory. Directories with changes below
72 a cut-off percent (3% by default) are not shown. The cut-off percent
73 - can be set with `--dirstat=limit`. Changes in a child directory is not
73 + can be set with `--dirstat=<limit>`. Changes in a child directory are not
74 counted for the parent directory, unless `--cumulative` is used.
75
76 ---dirstat-by-file[=limit]::
76 +--dirstat-by-file[=<limit>]::
77 Same as `--dirstat`, but counts changed files instead of lines.
78
79 --summary::
Documentation/git-apply.txt
+2 -2
@@ -12,10 +12,10 @@ SYNOPSIS
12 'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
13 [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
14 [--allow-binary-replacement | --binary] [--reject] [-z]
15 - [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
15 + [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
16 [--ignore-space-change | --ignore-whitespace ]
17 [--whitespace=<nowarn|warn|fix|error|error-all>]
18 - [--exclude=PATH] [--include=PATH] [--directory=<root>]
18 + [--exclude=<path>] [--include=<path>] [--directory=<root>]
19 [--verbose] [<patch>...]
20
21 DESCRIPTION
Documentation/git-archive.txt
+2 -2
@@ -12,7 +12,7 @@ SYNOPSIS
12 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
13 [-o | --output=<file>] [--worktree-attributes]
14 [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
15 - [path...]
15 + [<path>...]
16
17 DESCRIPTION
18 -----------
@@ -73,7 +73,7 @@ OPTIONS
73 <tree-ish>::
74 The tree or commit to produce an archive for.
75
76 -path::
76 +<path>::
77 Without an optional path parameter, all files and subdirectories
78 of the current working directory are included in the archive.
79 If one or more paths are specified, only these are included.
Documentation/git-bundle.txt
+3 -3
@@ -11,8 +11,8 @@ SYNOPSIS
11 [verse]
12 'git bundle' create <file> <git-rev-list-args>
13 'git bundle' verify <file>
14 -'git bundle' list-heads <file> [refname...]
15 -'git bundle' unbundle <file> [refname...]
14 +'git bundle' list-heads <file> [<refname>...]
15 +'git bundle' unbundle <file> [<refname>...]
16
17 DESCRIPTION
18 -----------
@@ -68,7 +68,7 @@ unbundle <file>::
68 packaged.
69
70
71 -[refname...]::
71 +[<refname>...]::
72 A list of references used to limit the references reported as
73 available. This is principally of use to 'git fetch', which
74 expects to receive only those references asked for and not
Documentation/git-daemon.txt
+24 -24
@@ -9,15 +9,15 @@ SYNOPSIS
9 --------
10 [verse]
11 'git daemon' [--verbose] [--syslog] [--export-all]
12 - [--timeout=n] [--init-timeout=n] [--max-connections=n]
13 - [--strict-paths] [--base-path=path] [--base-path-relaxed]
14 - [--user-path | --user-path=path]
15 - [--interpolated-path=pathtemplate]
16 - [--reuseaddr] [--detach] [--pid-file=file]
17 - [--enable=service] [--disable=service]
18 - [--allow-override=service] [--forbid-override=service]
19 - [--inetd | [--listen=host_or_ipaddr] [--port=n] [--user=user [--group=group]]
20 - [directory...]
12 + [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]
13 + [--strict-paths] [--base-path=<path>] [--base-path-relaxed]
14 + [--user-path | --user-path=<path>]
15 + [--interpolated-path=<pathtemplate>]
16 + [--reuseaddr] [--detach] [--pid-file=<file>]
17 + [--enable=<service>] [--disable=<service>]
18 + [--allow-override=<service>] [--forbid-override=<service>]
19 + [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]
20 + [<directory>...]
21
22 DESCRIPTION
23 -----------
@@ -48,7 +48,7 @@ OPTIONS
48 'git daemon' will refuse to start when this option is enabled and no
49 whitelist is specified.
50
51 ---base-path=path::
51 +--base-path=<path>::
52 Remap all the path requests as relative to the given path.
53 This is sort of "GIT root" - if you run 'git daemon' with
54 '--base-path=/srv/git' on example.com, then if you later try to pull
@@ -61,7 +61,7 @@ OPTIONS
61 This is useful for switching to --base-path usage, while still
62 allowing the old paths.
63
64 ---interpolated-path=pathtemplate::
64 +--interpolated-path=<pathtemplate>::
65 To support virtual hosting, an interpolated path template can be
66 used to dynamically construct alternate paths. The template
67 supports %H for the target hostname as supplied by the client but
@@ -80,27 +80,27 @@ OPTIONS
80 Have the server run as an inetd service. Implies --syslog.
81 Incompatible with --port, --listen, --user and --group options.
82
83 ---listen=host_or_ipaddr::
83 +--listen=<host_or_ipaddr>::
84 Listen on a specific IP address or hostname. IP addresses can
85 be either an IPv4 address or an IPv6 address if supported. If IPv6
86 is not supported, then --listen=hostname is also not supported and
87 --listen must be given an IPv4 address.
88 Incompatible with '--inetd' option.
89
90 ---port=n::
90 +--port=<n>::
91 Listen on an alternative port. Incompatible with '--inetd' option.
92
93 ---init-timeout=n::
93 +--init-timeout=<n>::
94 Timeout between the moment the connection is established and the
95 client request is received (typically a rather low value, since
96 that should be basically immediate).
97
98 ---timeout=n::
98 +--timeout=<n>::
99 Timeout for specific client sub-requests. This includes the time
100 it takes for the server to process the sub-request and the time spent
101 waiting for the next client's request.
102
103 ---max-connections=n::
103 +--max-connections=<n>::
104 Maximum number of concurrent clients, defaults to 32. Set it to
105 zero for no limit.
106
@@ -109,7 +109,7 @@ OPTIONS
109 --verbose, thus by default only error conditions will be logged.
110
111 --user-path::
112 ---user-path=path::
112 +--user-path=<path>::
113 Allow {tilde}user notation to be used in requests. When
114 specified with no parameter, requests to
115 git://host/{tilde}alice/foo is taken as a request to access
@@ -129,12 +129,12 @@ OPTIONS
129 --detach::
130 Detach from the shell. Implies --syslog.
131
132 ---pid-file=file::
132 +--pid-file=<file>::
133 Save the process id in 'file'. Ignored when the daemon
134 is run under `--inetd`.
135
136 ---user=user::
137 ---group=group::
136 +--user=<user>::
137 +--group=<group>::
138 Change daemon's uid and gid before entering the service loop.
139 When only `--user` is given without `--group`, the
140 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
145 the facility of inet daemon to achieve the same before spawning
146 'git daemon' if needed.
147
148 ---enable=service::
149 ---disable=service::
148 +--enable=<service>::
149 +--disable=<service>::
150 Enable/disable the service site-wide per default. Note
151 that a service disabled site-wide can still be enabled
152 per repository if it is marked overridable and the
153 repository enables the service with a configuration
154 item.
155
156 ---allow-override=service::
157 ---forbid-override=service::
156 +--allow-override=<service>::
157 +--forbid-override=<service>::
158 Allow/forbid overriding the site-wide default with per
159 repository configuration. By default, all the services
160 are overridable.
Documentation/git-fast-export.txt
+1 -1
@@ -96,7 +96,7 @@ marks the same across runs.
96 in the commit (as opposed to just listing the files which are
97 different from the commit's first parent).
98
99 -[git-rev-list-args...]::
99 +[<git-rev-list-args>...]::
100 A list of arguments, acceptable to 'git rev-parse' and
101 'git rev-list', that specifies the specific objects and references
102 to export. For example, `master{tilde}10..master` causes the
Documentation/git-index-pack.txt
+2 -2
@@ -59,10 +59,10 @@ OPTIONS
59 the newly constructed pack and index before refs can be
60 updated to use objects contained in the pack.
61
62 ---keep='why'::
62 +--keep=<msg>::
63 Like --keep create a .keep file before moving the index into
64 its final destination, but rather than creating an empty file
65 - place 'why' followed by an LF into the .keep file. The 'why'
65 + place '<msg>' followed by an LF into the .keep file. The '<msg>'
66 message can later be searched for within all .keep files to
67 locate any which have outlived their usefulness.
68
Documentation/git-ls-tree.txt
+5 -5
@@ -10,8 +10,8 @@ SYNOPSIS
10 --------
11 [verse]
12 'git ls-tree' [-d] [-r] [-t] [-l] [-z]
13 - [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev=[<n>]]
14 - <tree-ish> [paths...]
13 + [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]
14 + <tree-ish> [<path>...]
15
16 DESCRIPTION
17 -----------
@@ -19,11 +19,11 @@ Lists the contents of a given tree object, like what "/bin/ls -a" does
19 in the current working directory. Note that:
20
21 - the behaviour is slightly different from that of "/bin/ls" in that the
22 - 'paths' denote just a list of patterns to match, e.g. so specifying
22 + '<path>' denotes just a list of patterns to match, e.g. so specifying
23 directory name (without '-r') will behave differently, and order of the
24 arguments does not matter.
25
26 - - the behaviour is similar to that of "/bin/ls" in that the 'paths' is
26 + - the behaviour is similar to that of "/bin/ls" in that the '<path>' is
27 taken as relative to the current working directory. E.g. when you are
28 in a directory 'sub' that has a directory 'dir', you can run 'git
29 ls-tree -r HEAD dir' to list the contents of the tree (that is
@@ -72,7 +72,7 @@ OPTIONS
72 Do not limit the listing to the current working directory.
73 Implies --full-name.
74
75 -paths::
75 +[<path>...]::
76 When paths are given, show them (note that this isn't really raw
77 pathnames, but rather a list of patterns to match). Otherwise
78 implicitly uses the root level of the tree as the sole path argument.
Documentation/git-pack-objects.txt
+7 -7
@@ -11,7 +11,7 @@ SYNOPSIS
11 [verse]
12 'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]
13 [--no-reuse-delta] [--delta-base-offset] [--non-empty]
14 - [--local] [--incremental] [--window=N] [--depth=N]
14 + [--local] [--incremental] [--window=<n>] [--depth=<n>]
15 [--revs [--unpacked | --all]*] [--stdout | base-name]
16 [--keep-true-parents] < object-list
17
@@ -82,8 +82,8 @@ base-name::
82 reference was included in the resulting packfile. This
83 can be useful to send new tags to native git clients.
84
85 ---window=[N]::
86 ---depth=[N]::
85 +--window=<n>::
86 +--depth=<n>::
87 These two options affect how the objects contained in
88 the pack are stored using delta compression. The
89 objects are first internally sorted by type, size and
@@ -95,10 +95,10 @@ base-name::
95 times to get to the necessary object.
96 The default value for --window is 10 and --depth is 50.
97
98 ---window-memory=[N]::
98 +--window-memory=<n>::
99 This option provides an additional limit on top of `--window`;
100 the window size will dynamically scale down so as to not take
101 - up more than N bytes in memory. This is useful in
101 + up more than '<n>' bytes in memory. This is useful in
102 repositories with a mix of large and small objects to not run
103 out of memory with a large window, but still be able to take
104 advantage of the large window for the smaller objects. The
@@ -106,7 +106,7 @@ base-name::
106 `--window-memory=0` makes memory usage unlimited, which is the
107 default.
108
109 ---max-pack-size=[N]::
109 +--max-pack-size=<n>::
110 Maximum size of each output pack file. The size can be suffixed with
111 "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
112 If specified, multiple packfiles may be created.
@@ -171,7 +171,7 @@ base-name::
171 wholesale enforcement of a different compression level on the
172 packed data is desired.
173
174 ---compression=[N]::
174 +--compression=<n>::
175 Specifies compression level for newly-compressed data in the
176 generated pack. If not specified, pack compression level is
177 determined first by pack.compression, then by core.compression,
Documentation/git-remote.txt
+1 -1
@@ -20,7 +20,7 @@ SYNOPSIS
20 'git remote set-url --delete' [--push] <name> <url>
21 'git remote' [-v | --verbose] 'show' [-n] <name>
22 'git remote prune' [-n | --dry-run] <name>
23 -'git remote' [-v | --verbose] 'update' [-p | --prune] [group | remote]...
23 +'git remote' [-v | --verbose] 'update' [-p | --prune] [<group> | <remote>]...
24
25 DESCRIPTION
26 -----------
Documentation/git-repack.txt
+6 -6
@@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository
8
9 SYNOPSIS
10 --------
11 -'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]
11 +'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
12
13 DESCRIPTION
14 -----------
@@ -76,8 +76,8 @@ other objects in that pack they already have locally.
76 this repository (or a direct copy of it)
77 over HTTP or FTP. See linkgit:git-update-server-info[1].
78
79 ---window=[N]::
80 ---depth=[N]::
79 +--window=<n>::
80 +--depth=<n>::
81 These two options affect how the objects contained in the pack are
82 stored using delta compression. The objects are first internally
83 sorted by type, size and optionally names and compared against the
@@ -87,10 +87,10 @@ other objects in that pack they already have locally.
87 to be applied that many times to get to the necessary object.
88 The default value for --window is 10 and --depth is 50.
89
90 ---window-memory=[N]::
90 +--window-memory=<n>::
91 This option provides an additional limit on top of `--window`;
92 the window size will dynamically scale down so as to not take
93 - up more than N bytes in memory. This is useful in
93 + up more than '<n>' bytes in memory. This is useful in
94 repositories with a mix of large and small objects to not run
95 out of memory with a large window, but still be able to take
96 advantage of the large window for the smaller objects. The
@@ -98,7 +98,7 @@ other objects in that pack they already have locally.
98 `--window-memory=0` makes memory usage unlimited, which is the
99 default.
100
101 ---max-pack-size=[N]::
101 +--max-pack-size=<n>::
102 Maximum size of each output pack file. The size can be suffixed with
103 "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
104 If specified, multiple packfiles may be created.
Documentation/git-rev-list.txt
+8 -8
@@ -9,10 +9,10 @@ git-rev-list - Lists commit objects in reverse chronological order
9 SYNOPSIS
10 --------
11 [verse]
12 -'git rev-list' [ \--max-count=number ]
13 - [ \--skip=number ]
14 - [ \--max-age=timestamp ]
15 - [ \--min-age=timestamp ]
12 +'git rev-list' [ \--max-count=<number> ]
13 + [ \--skip=<number> ]
14 + [ \--max-age=<timestamp> ]
15 + [ \--min-age=<timestamp> ]
16 [ \--sparse ]
17 [ \--merges ]
18 [ \--no-merges ]
@@ -21,10 +21,10 @@ SYNOPSIS
21 [ \--full-history ]
22 [ \--not ]
23 [ \--all ]
24 - [ \--branches[=pattern] ]
25 - [ \--tags[=pattern] ]
26 - [ \--remotes[=pattern] ]
27 - [ \--glob=glob-pattern ]
24 + [ \--branches[=<pattern>] ]
25 + [ \--tags[=<pattern>] ]
26 + [ \--remotes[=<pattern>] ]
27 + [ \--glob=<glob-pattern> ]
28 [ \--stdin ]
29 [ \--quiet ]
30 [ \--topo-order ]
Documentation/git-web--browse.txt
+8 -8
@@ -32,19 +32,19 @@ Custom commands may also be specified.
32
33 OPTIONS
34 -------
35 --b BROWSER::
36 ---browser=BROWSER::
37 - Use the specified BROWSER. It must be in the list of supported
35 +-b <browser>::
36 +--browser=<browser>::
37 + Use the specified browser. It must be in the list of supported
38 browsers.
39
40 --t BROWSER::
41 ---tool=BROWSER::
40 +-t <browser>::
41 +--tool=<browser>::
42 Same as above.
43
44 --c CONF.VAR::
45 ---config=CONF.VAR::
44 +-c <conf.var>::
45 +--config=<conf.var>::
46 CONF.VAR is looked up in the git config files. If it's set,
47 - then its value specify the browser that should be used.
47 + then its value specifies the browser that should be used.
48
49 CONFIGURATION VARIABLES
50 -----------------------
Documentation/git.txt
+6 -6
@@ -9,11 +9,11 @@ git - the stupid content tracker
9 SYNOPSIS
10 --------
11 [verse]
12 -'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
12 +'git' [--version] [--exec-path[=<path>]] [--html-path]
13 [-p|--paginate|--no-pager] [--no-replace-objects]
14 - [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
15 - [-c name=value]
16 - [--help] COMMAND [ARGS]
14 + [--bare] [--git-dir=<path>] [--work-tree=<path>]
15 + [-c <name>=<value>]
16 + [--help] <command> [<args>]
17
18 DESCRIPTION
19 -----------
@@ -28,7 +28,7 @@ also want to read linkgit:gitcvs-migration[7]. See
28 the link:user-manual.html[Git User's Manual] for a more in-depth
29 introduction.
30
31 -The COMMAND is either a name of a Git command (see below) or an alias
31 +The '<command>' is either a name of a Git command (see below) or an alias
32 as defined in the configuration file (see linkgit:git-config[1]).
33
34 Formatted and hyperlinked version of the latest git
@@ -252,7 +252,7 @@ help ...`.
252 The <name> is expected in the same format as listed by
253 'git config' (subkeys separated by dots).
254
255 ---exec-path::
255 +--exec-path[=<path>]::
256 Path to wherever your core git programs are installed.
257 This can also be controlled by setting the GIT_EXEC_PATH
258 environment variable. If no path is given, 'git' will print
Documentation/merge-strategies.txt
+1 -1
@@ -52,7 +52,7 @@ no-renormalize;;
52 Disables the `renormalize` option. This overrides the
53 `merge.renormalize` configuration variable.
54
55 -subtree[=path];;
55 +subtree[=<path>];;
56 This option is a more advanced form of 'subtree' strategy, where
57 the strategy makes a guess on how two trees must be shifted to
58 match with each other when merging. Instead, the specified path
Documentation/rev-list-options.txt
+8 -8
@@ -246,29 +246,29 @@ endif::git-rev-list[]
246 Pretend as if all the refs in `refs/` are listed on the
247 command line as '<commit>'.
248
249 ---branches[=pattern]::
249 +--branches[=<pattern>]::
250
251 Pretend as if all the refs in `refs/heads` are listed
252 - on the command line as '<commit>'. If `pattern` is given, limit
252 + on the command line as '<commit>'. If '<pattern>' is given, limit
253 branches to ones matching given shell glob. If pattern lacks '?',
254 '*', or '[', '/*' at the end is implied.
255
256 ---tags[=pattern]::
256 +--tags[=<pattern>]::
257
258 Pretend as if all the refs in `refs/tags` are listed
259 - on the command line as '<commit>'. If `pattern` is given, limit
259 + on the command line as '<commit>'. If '<pattern>' is given, limit
260 tags to ones matching given shell glob. If pattern lacks '?', '*',
261 or '[', '/*' at the end is implied.
262
263 ---remotes[=pattern]::
263 +--remotes[=<pattern>]::
264
265 Pretend as if all the refs in `refs/remotes` are listed
266 - on the command line as '<commit>'. If `pattern`is given, limit
266 + on the command line as '<commit>'. If '<pattern>' is given, limit
267 remote tracking branches to ones matching given shell glob.
268 If pattern lacks '?', '*', or '[', '/*' at the end is implied.
269
270 ---glob=glob-pattern::
271 - Pretend as if all the refs matching shell glob `glob-pattern`
270 +--glob=<glob-pattern>::
271 + Pretend as if all the refs matching shell glob '<glob-pattern>'
272 are listed on the command line as '<commit>'. Leading 'refs/',
273 is automatically prepended if missing. If pattern lacks '?', '*',
274 or '[', '/*' at the end is implied.
archive.c
+2 -2
@@ -7,9 +7,9 @@
7 #include "unpack-trees.h"
8
9 static char const * const archive_usage[] = {
10 - "git archive [options] <tree-ish> [path...]",
10 + "git archive [options] <tree-ish> [<path>...]",
11 "git archive --list",
12 - "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]",
12 + "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]",
13 "git archive --remote <repo> [--exec <cmd>] --list",
14 NULL
15 };
builtin/bundle.c
+2 -2
@@ -12,8 +12,8 @@
12 static const char builtin_bundle_usage[] =
13 "git bundle create <file> <git-rev-list args>\n"
14 " or: git bundle verify <file>\n"
15 - " or: git bundle list-heads <file> [refname...]\n"
16 - " or: git bundle unbundle <file> [refname...]";
15 + " or: git bundle list-heads <file> [<refname>...]\n"
16 + " or: git bundle unbundle <file> [<refname>...]";
17
18 int cmd_bundle(int argc, const char **argv, const char *prefix)
19 {
builtin/grep.c
+1 -1
@@ -24,7 +24,7 @@
24 #endif
25
26 static char const * const grep_usage[] = {
27 - "git grep [options] [-e] <pattern> [<rev>...] [[--] path...]",
27 + "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]",
28 NULL
29 };
30
builtin/ls-tree.c
+1 -1
@@ -24,7 +24,7 @@ static int chomp_prefix;
24 static const char *ls_tree_prefix;
25
26 static const char * const ls_tree_usage[] = {
27 - "git ls-tree [<options>] <tree-ish> [path...]",
27 + "git ls-tree [<options>] <tree-ish> [<path>...]",
28 NULL
29 };
30
builtin/pack-objects.c
+3 -3
@@ -25,10 +25,10 @@
25 static const char pack_usage[] =
26 "git pack-objects [{ -q | --progress | --all-progress }]\n"
27 " [--all-progress-implied]\n"
28 - " [--max-pack-size=N] [--local] [--incremental]\n"
29 - " [--window=N] [--window-memory=N] [--depth=N]\n"
28 + " [--max-pack-size=<n>] [--local] [--incremental]\n"
29 + " [--window=<n>] [--window-memory=<n>] [--depth=<n>]\n"
30 " [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n"
31 - " [--threads=N] [--non-empty] [--revs [--unpacked | --all]*]\n"
31 + " [--threads=<n>] [--non-empty] [--revs [--unpacked | --all]]\n"
32 " [--reflog] [--stdout | base-name] [--include-tag]\n"
33 " [--keep-unreachable | --unpack-unreachable]\n"
34 " [<ref-list | <object-list]";
builtin/remote.c
+1 -1
@@ -15,7 +15,7 @@ static const char * const builtin_remote_usage[] = {
15 "git remote set-head <name> (-a | -d | <branch>)",
16 "git remote [-v | --verbose] show [-n] <name>",
17 "git remote prune [-n | --dry-run] <name>",
18 - "git remote [-v | --verbose] update [-p | --prune] [group | remote]",
18 + "git remote [-v | --verbose] update [-p | --prune] [<group> | <remote>]",
19 "git remote set-branches <name> [--add] <branch>...",
20 "git remote set-url <name> <newurl> [<oldurl>]",
21 "git remote set-url --add <name> <newurl>",
builtin/rev-list.c
+4 -4
@@ -11,9 +11,9 @@
11 static const char rev_list_usage[] =
12 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
13 " limiting output:\n"
14 -" --max-count=nr\n"
15 -" --max-age=epoch\n"
16 -" --min-age=epoch\n"
14 +" --max-count=<n>\n"
15 +" --max-age=<epoch>\n"
16 +" --min-age=<epoch>\n"
17 " --sparse\n"
18 " --no-merges\n"
19 " --remove-empty\n"
@@ -33,7 +33,7 @@ static const char rev_list_usage[] =
33 " --objects | --objects-edge\n"
34 " --unpacked\n"
35 " --header | --pretty\n"
36 -" --abbrev=nr | --no-abbrev\n"
36 +" --abbrev=<n> | --no-abbrev\n"
37 " --abbrev-commit\n"
38 " --left-right\n"
39 " special purpose:\n"
daemon.c
+9 -9
@@ -20,15 +20,15 @@ static int reuseaddr;
20
21 static const char daemon_usage[] =
22 "git daemon [--verbose] [--syslog] [--export-all]\n"
23 -" [--timeout=n] [--init-timeout=n] [--max-connections=n]\n"
24 -" [--strict-paths] [--base-path=path] [--base-path-relaxed]\n"
25 -" [--user-path | --user-path=path]\n"
26 -" [--interpolated-path=path]\n"
27 -" [--reuseaddr] [--detach] [--pid-file=file]\n"
28 -" [--[enable|disable|allow-override|forbid-override]=service]\n"
29 -" [--inetd | [--listen=host_or_ipaddr] [--port=n]\n"
30 -" [--user=user [--group=group]]\n"
31 -" [directory...]";
23 +" [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
24 +" [--strict-paths] [--base-path=<path>] [--base-path-relaxed]\n"
25 +" [--user-path | --user-path=<path>]\n"
26 +" [--interpolated-path=<path>]\n"
27 +" [--reuseaddr] [--detach] [--pid-file=<file>]\n"
28 +" [--(enable|disable|allow-override|forbid-override)=<service>]\n"
29 +" [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>]\n"
30 +" [--user=<user> [--group=<group>]]\n"
31 +" [<directory>...]";
32
33 /* List of acceptable pathname prefixes */
34 static char **ok_paths;
fast-import.c
+1 -1
@@ -2884,7 +2884,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)
2884 }
2885
2886 static const char fast_import_usage[] =
2887 -"git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2887 +"git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
2888
2889 static void parse_argv(void)
2890 {
git.c
+4 -4
@@ -6,14 +6,14 @@
6 #include "run-command.h"
7
8 const char git_usage_string[] =
9 - "git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]\n"
9 + "git [--version] [--exec-path[=<path>]] [--html-path]\n"
10 " [-p|--paginate|--no-pager] [--no-replace-objects]\n"
11 - " [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]\n"
11 + " [--bare] [--git-dir=<path>] [--work-tree=<path>]\n"
12 " [-c name=value] [--help]\n"
13 - " COMMAND [ARGS]";
13 + " <command> [<args>]";
14
15 const char git_more_info_string[] =
16 - "See 'git help COMMAND' for more information on a specific command.";
16 + "See 'git help <command>' for more information on a specific command.";
17
18 static struct startup_info git_startup_info;
19 static int use_pager = -1;
upload-pack.c
+1 -1
@@ -11,7 +11,7 @@
11 #include "list-objects.h"
12 #include "run-command.h"
13
14 -static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>";
14 +static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
15
16 /* bits #0..7 in revision.h, #8..10 in commit.c */
17 #define THEY_HAVE (1u << 11)