@matheusbsbs / matheus-bagliano / commits / 3240240ff4
Fork 0

Docs: Use "-l::\n--long\n" format in OPTIONS sections

The OPTIONS section of a documentation file contains a list of the options a git command accepts. Currently there are several variants to describe the case that different options (almost) do the same in the OPTIONS section. Some are: -f, --foo:: -f|--foo:: -f | --foo:: But AsciiDoc has the special form: -f:: --foo:: This patch applies this form to the documentation of the whole git suite, and removes useless em-dash prevention, so \--foo becomes --foo. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stephan Beyer committed Jun 8, 2008 at 03:36 UTC 3240240ff427fa2e26a847c7c9fd89e6a4313daa
56 files changed +394 -210
Documentation/blame-options.txt
+4 -2
@@ -41,7 +41,8 @@ of lines before or after the line given by <start>.
41 -S <revs-file>::
42 Use revs from revs-file instead of calling linkgit:git-rev-list[1].
43
44 --p, --porcelain::
44 +-p::
45 +--porcelain::
46 Show in a format designed for machine consumption.
47
48 --incremental::
@@ -83,5 +84,6 @@ alphanumeric characters that git must detect as moving
84 between files for it to associate those lines with the parent
85 commit.
86
86 --h, --help::
87 +-h::
88 +--help::
89 Show help message.
Documentation/fetch-options.txt
+19 -11
@@ -1,22 +1,26 @@
1 --q, \--quiet::
1 +-q::
2 +--quiet::
3 Pass --quiet to git-fetch-pack and silence any other internally
4 used programs.
5
5 --v, \--verbose::
6 +-v::
7 +--verbose::
8 Be verbose.
9
8 --a, \--append::
10 +-a::
11 +--append::
12 Append ref names and object names of fetched refs to the
13 existing contents of `.git/FETCH_HEAD`. Without this
14 option old data in `.git/FETCH_HEAD` will be overwritten.
15
13 -\--upload-pack <upload-pack>::
16 +--upload-pack <upload-pack>::
17 When given, and the repository to fetch from is handled
18 by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
19 the command to specify non-default path for the command
20 run on the other end.
21
19 --f, \--force::
22 +-f::
23 +--force::
24 When `git-fetch` is used with `<rbranch>:<lbranch>`
25 refspec, it refuses to update the local branch
26 `<lbranch>` unless the remote branch `<rbranch>` it
@@ -24,16 +28,18 @@
28 overrides that check.
29
30 ifdef::git-pull[]
27 -\--no-tags::
31 +--no-tags::
32 endif::git-pull[]
33 ifndef::git-pull[]
30 --n, \--no-tags::
34 +-n::
35 +--no-tags::
36 endif::git-pull[]
37 By default, tags that point at objects that are downloaded
38 from the remote repository are fetched and stored locally.
39 This option disables this automatic tag following.
40
36 --t, \--tags::
41 +-t::
42 +--tags::
43 Most of the tags are fetched automatically as branch
44 heads are downloaded, but tags that do not point at
45 objects reachable from the branch heads that are being
@@ -41,10 +47,12 @@ endif::git-pull[]
47 flag lets all tags and their associated objects be
48 downloaded.
49
44 --k, \--keep::
50 +-k::
51 +--keep::
52 Keep downloaded pack.
53
47 --u, \--update-head-ok::
54 +-u::
55 +--update-head-ok::
56 By default `git-fetch` refuses to update the head which
57 corresponds to the current branch. This flag disables the
58 check. This is purely for the internal use for `git-pull`
@@ -52,7 +60,7 @@ endif::git-pull[]
60 implementing your own Porcelain you are not supposed to
61 use it.
62
55 -\--depth=<depth>::
63 +--depth=<depth>::
64 Deepen the history of a 'shallow' repository created by
65 `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
66 by the specified number of commits.
Documentation/git-add.txt
+10 -6
@@ -50,22 +50,26 @@ OPTIONS
50 and `dir/file2`) can be given to add all files in the
51 directory, recursively.
52
53 --n, \--dry-run::
53 +-n::
54 +--dry-run::
55 Don't actually add the file(s), just show if they exist.
56
56 --v, \--verbose::
57 +-v::
58 +--verbose::
59 Be verbose.
60
61 -f::
62 Allow adding otherwise ignored files.
63
62 --i, \--interactive::
64 +-i::
65 +--interactive::
66 Add modified contents in the working tree interactively to
67 the index. Optional path arguments may be supplied to limit
68 operation to a subset of the working tree. See ``Interactive
69 mode'' for details.
70
68 --p, \--patch::
71 +-p::
72 +--patch::
73 Similar to Interactive mode but the initial command loop is
74 bypassed and the 'patch' subcommand is invoked using each of
75 the specified filepatterns before exiting.
@@ -79,11 +83,11 @@ OPTIONS
83 command line. If no paths are specified, all tracked files in the
84 current directory and its subdirectories are updated.
85
82 -\--refresh::
86 +--refresh::
87 Don't add the file(s), but only refresh their stat()
88 information in the index.
89
86 -\--ignore-errors::
90 +--ignore-errors::
91 If some files could not be added because of errors indexing
92 them, do not abort the operation, but continue adding the
93 others. The command shall still exit with non-zero status.
Documentation/git-am.txt
+16 -8
@@ -28,14 +28,17 @@ OPTIONS
28 supply this argument, reads from the standard input. If you supply
29 directories, they'll be treated as Maildirs.
30
31 --s, --signoff::
31 +-s::
32 +--signoff::
33 Add `Signed-off-by:` line to the commit message, using
34 the committer identity of yourself.
35
35 --k, --keep::
36 +-k::
37 +--keep::
38 Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
39
38 --u, --utf8::
40 +-u::
41 +--utf8::
42 Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
43 The proposed commit log message taken from the e-mail
44 is re-coded into UTF-8 encoding (configuration variable
@@ -49,13 +52,15 @@ default. You could use `--no-utf8` to override this.
52 Pass `-n` flag to `git-mailinfo` (see
53 linkgit:git-mailinfo[1]).
54
52 --3, --3way::
55 +-3::
56 +--3way::
57 When the patch does not apply cleanly, fall back on
58 3-way merge, if the patch records the identity of blobs
59 it is supposed to apply to, and we have those blobs
60 available locally.
61
58 --b, --binary::
62 +-b::
63 +--binary::
64 Pass `--allow-binary-replacement` flag to `git-apply`
65 (see linkgit:git-apply[1]).
66
@@ -64,19 +69,22 @@ default. You could use `--no-utf8` to override this.
69 program that applies
70 the patch.
71
67 --C<n>, -p<n>::
72 +-C<n>::
73 +-p<n>::
74 These flags are passed to the `git-apply` (see linkgit:git-apply[1])
75 program that applies
76 the patch.
77
72 --i, --interactive::
78 +-i::
79 +--interactive::
80 Run interactively.
81
82 --skip::
83 Skip the current patch. This is only meaningful when
84 restarting an aborted patch.
85
79 --r, --resolved::
86 +-r::
87 +--resolved::
88 After a patch failure (e.g. attempting to apply
89 conflicting patch), the user has applied it by hand and
90 the index file stores the result of the application.
Documentation/git-apply.txt
+6 -3
@@ -73,7 +73,8 @@ OPTIONS
73 When a pure mode change is encountered (which has no index information),
74 the information is read from the current index instead.
75
76 --R, --reverse::
76 +-R::
77 +--reverse::
78 Apply the patch in reverse.
79
80 --reject::
@@ -124,7 +125,8 @@ discouraged.
125 the result with this option, which would apply the
126 deletion part but not addition part.
127
127 ---allow-binary-replacement, --binary::
128 +--allow-binary-replacement::
129 +--binary::
130 Historically we did not allow binary patch applied
131 without an explicit permission from the user, and this
132 flag was the way to do so. Currently we always allow binary
@@ -169,7 +171,8 @@ behavior:
171 correctly. This option adds support for applying such patches by
172 working around this bug.
173
172 --v, --verbose::
174 +-v::
175 +--verbose::
176 Report progress to stderr. By default, only a message about the
177 current patch being applied will be printed. This option will cause
178 additional information to be reported.
Documentation/git-archive.txt
+4 -2
@@ -36,10 +36,12 @@ OPTIONS
36 Format of the resulting archive: 'tar' or 'zip'. The default
37 is 'tar'.
38
39 ---list, -l::
39 +-l::
40 +--list::
41 Show all available formats.
42
42 ---verbose, -v::
43 +-v::
44 +--verbose::
45 Report progress to stderr.
46
47 --prefix=<prefix>/::
Documentation/git-blame.txt
+4 -2
@@ -52,12 +52,14 @@ include::blame-options.txt[]
52 a certain threshold for git-blame to consider those lines
53 of code to have been moved.
54
55 --f, --show-name::
55 +-f::
56 +--show-name::
57 Show filename in the original commit. By default
58 filename is shown if there is any line that came from a
59 file with different name, due to rename detection.
60
60 --n, --show-number::
61 +-n::
62 +--show-number::
63 Show line number in the original commit (Default: off).
64
65 -s::
Documentation/git-branch.txt
+2 -1
@@ -95,7 +95,8 @@ OPTIONS
95 -a::
96 List both remote-tracking branches and local branches.
97
98 --v, --verbose::
98 +-v::
99 +--verbose::
100 Show sha1 and commit subject line for each head.
101
102 --abbrev=<length>::
Documentation/git-checkout-index.txt
+10 -5
@@ -22,21 +22,26 @@ Will copy all files listed from the index to the working directory
22
23 OPTIONS
24 -------
25 --u|--index::
25 +-u::
26 +--index::
27 update stat information for the checked out entries in
28 the index file.
29
29 --q|--quiet::
30 +-q::
31 +--quiet::
32 be quiet if files exist or are not in the index
33
32 --f|--force::
34 +-f::
35 +--force::
36 forces overwrite of existing files
37
35 --a|--all::
38 +-a::
39 +--all::
40 checks out all files in the index. Cannot be used
41 together with explicit filenames.
42
39 --n|--no-create::
43 +-n::
44 +--no-create::
45 Don't checkout new files, only refresh files already checked
46 out.
47
Documentation/git-checkout.txt
+2 -1
@@ -47,7 +47,8 @@ OPTIONS
47 by linkgit:git-check-ref-format[1]. Some of these checks
48 may restrict the characters allowed in a branch name.
49
50 --t, --track::
50 +-t::
51 +--track::
52 When creating a new branch, set up configuration so that git-pull
53 will automatically retrieve data from the start point, which must be
54 a branch. Use this if you always pull from the same upstream branch
Documentation/git-cherry-pick.txt
+8 -4
@@ -22,7 +22,8 @@ OPTIONS
22 For a more complete list of ways to spell commits, see
23 "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
24
25 --e|--edit::
25 +-e::
26 +--edit::
27 With this option, `git-cherry-pick` will let you edit the commit
28 message prior to committing.
29
@@ -44,14 +45,16 @@ OPTIONS
45 described above, and `-r` was to disable it. Now the
46 default is not to do `-x` so this option is a no-op.
47
47 --m parent-number|--mainline parent-number::
48 +-m parent-number::
49 +--mainline parent-number::
50 Usually you cannot cherry-pick a merge because you do not know which
51 side of the merge should be considered the mainline. This
52 option specifies the parent number (starting from 1) of
53 the mainline and allows cherry-pick to replay the change
54 relative to the specified parent.
55
54 --n|--no-commit::
56 +-n::
57 +--no-commit::
58 Usually the command automatically creates a commit with
59 a commit log message stating which commit was
60 cherry-picked. This flag applies the change necessary
@@ -64,7 +67,8 @@ OPTIONS
67 This is useful when cherry-picking more than one commits'
68 effect to your working tree in a row.
69
67 --s|--signoff::
70 +-s::
71 +--signoff::
72 Add Signed-off-by line at the end of the commit message.
73
74
Documentation/git-commit.txt
+28 -14
@@ -52,21 +52,25 @@ that, you can recover from it with linkgit:git-reset[1].
52
53 OPTIONS
54 -------
55 --a|--all::
55 +-a::
56 +--all::
57 Tell the command to automatically stage files that have
58 been modified and deleted, but new files you have not
59 told git about are not affected.
60
60 --C <commit>|--reuse-message=<commit>::
61 +-C <commit>::
62 +--reuse-message=<commit>::
63 Take an existing commit object, and reuse the log message
64 and the authorship information (including the timestamp)
65 when creating the commit.
66
65 --c <commit>|--reedit-message=<commit>::
67 +-c <commit>::
68 +--reedit-message=<commit>::
69 Like '-C', but with '-c' the editor is invoked, so that
70 the user can further edit the commit message.
71
69 --F <file>|--file=<file>::
72 +-F <file>::
73 +--file=<file>::
74 Take the commit message from the given file. Use '-' to
75 read the message from the standard input.
76
@@ -74,20 +78,24 @@ OPTIONS
78 Override the author name used in the commit. Use
79 `A U Thor <author@example.com>` format.
80
77 --m <msg>|--message=<msg>::
81 +-m <msg>::
82 +--message=<msg>::
83 Use the given <msg> as the commit message.
84
80 --t <file>|--template=<file>::
85 +-t <file>::
86 +--template=<file>::
87 Use the contents of the given file as the initial version
88 of the commit message. The editor is invoked and you can
89 make subsequent changes. If a message is specified using
90 the `-m` or `-F` options, this option has no effect. This
91 overrides the `commit.template` configuration variable.
92
87 --s|--signoff::
93 +-s::
94 +--signoff::
95 Add Signed-off-by line at the end of the commit message.
96
90 --n|--no-verify::
97 +-n::
98 +--no-verify::
99 This option bypasses the pre-commit and commit-msg hooks.
100 See also linkgit:githooks[5][hooks].
101
@@ -107,7 +115,8 @@ OPTIONS
115 'whitespace' removes just leading/trailing whitespace lines
116 and 'strip' removes both whitespace and commentary.
117
110 --e|--edit::
118 +-e::
119 +--edit::
120 The message taken from file with `-F`, command line with
121 `-m`, and from file with `-C` are usually used as the
122 commit log message unmodified. This option lets you
@@ -134,13 +143,15 @@ It is a rough equivalent for:
143 but can be used to amend a merge commit.
144 --
145
137 --i|--include::
146 +-i::
147 +--include::
148 Before making a commit out of staged contents so far,
149 stage the contents of paths given on the command line
150 as well. This is usually not what you want unless you
151 are concluding a conflicted merge.
152
143 --o|--only::
153 +-o::
154 +--only::
155 Make a commit only from the paths specified on the
156 command line, disregarding any contents that have been
157 staged so far. This is the default mode of operation of
@@ -151,20 +162,23 @@ but can be used to amend a merge commit.
162 the last commit without committing changes that have
163 already been staged.
164
154 --u|--untracked-files::
165 +-u::
166 +--untracked-files::
167 Show all untracked files, also those in uninteresting
168 directories, in the "Untracked files:" section of commit
169 message template. Without this option only its name and
170 a trailing slash are displayed for each untracked
171 directory.
172
161 --v|--verbose::
173 +-v::
174 +--verbose::
175 Show unified diff between the HEAD commit and what
176 would be committed at the bottom of the commit message
177 template. Note that this diff output doesn't have its
178 lines prefixed with '#'.
179
167 --q|--quiet::
180 +-q::
181 +--quiet::
182 Suppress commit summary message.
183
184 \--::
Documentation/git-config.txt
+6 -3
@@ -101,7 +101,8 @@ rather than from all available files.
101 +
102 See also <<FILES>>.
103
104 --f config-file, --file config-file::
104 +-f config-file::
105 +--file config-file::
106 Use the given config file instead of the one specified by GIT_CONFIG.
107
108 --remove-section::
@@ -116,7 +117,8 @@ See also <<FILES>>.
117 --unset-all::
118 Remove all lines matching the key from config file.
119
119 --l, --list::
120 +-l::
121 +--list::
122 List all variables set in config file.
123
124 --bool::
@@ -128,7 +130,8 @@ See also <<FILES>>.
130 in the config file will cause the value to be multiplied
131 by 1024, 1048576, or 1073741824 prior to output.
132
131 --z, --null::
133 +-z::
134 +--null::
135 For all options that output values and/or keys, always
136 end values with the null character (instead of a
137 newline). Use newline instead as a delimiter between
Documentation/git-cvsserver.txt
+5 -2
@@ -41,10 +41,13 @@ Don't allow recursing into subdirectories
41 Don't check for `gitcvs.enabled` in config. You also have to specify a list
42 of allowed directories (see below) if you want to use this option.
43
44 ---version, -V::
44 +-V::
45 +--version::
46 Print version information and exit
47
47 ---help, -h, -H::
48 +-h::
49 +-H::
50 +--help::
51 Print usage information and exit
52
53 <directory>::
Documentation/git-daemon.txt
+8 -4
@@ -103,7 +103,8 @@ OPTIONS
103 Log to syslog instead of stderr. Note that this option does not imply
104 --verbose, thus by default only error conditions will be logged.
105
106 ---user-path, --user-path=path::
106 +--user-path::
107 +--user-path=path::
108 Allow ~user notation to be used in requests. When
109 specified with no parameter, requests to
110 git://host/~alice/foo is taken as a request to access
@@ -127,7 +128,8 @@ OPTIONS
128 Save the process id in 'file'. Ignored when the daemon
129 is run under `--inetd`.
130
130 ---user=user, --group=group::
131 +--user=user::
132 +--group=group::
133 Change daemon's uid and gid before entering the service loop.
134 When only `--user` is given without `--group`, the
135 primary group ID for the user is used. The values of
@@ -138,14 +140,16 @@ Giving these options is an error when used with `--inetd`; use
140 the facility of inet daemon to achieve the same before spawning
141 `git-daemon` if needed.
142
141 ---enable=service, --disable=service::
143 +--enable=service::
144 +--disable=service::
145 Enable/disable the service site-wide per default. Note
146 that a service disabled site-wide can still be enabled
147 per repository if it is marked overridable and the
148 repository enables the service with an configuration
149 item.
150
148 ---allow-override=service, --forbid-override=service::
151 +--allow-override=service::
152 +--forbid-override=service::
153 Allow/forbid overriding the site-wide default with per
154 repository configuration. By default, all the services
155 are overridable.
Documentation/git-diff-files.txt
+2 -1
@@ -30,7 +30,8 @@ The default is to diff against our branch (-2) and the
30 cleanly resolved paths. The option -0 can be given to
31 omit diff output for unmerged entries and just show "Unmerged".
32
33 --c,--cc::
33 +-c::
34 +--cc::
35 This compares stage 2 (our branch), stage 3 (their
36 branch) and the working tree file and outputs a combined
37 diff, similar to the way 'diff-tree' shows a merge
Documentation/git-fetch-pack.txt
+12 -10
@@ -28,30 +28,32 @@ have a common ancestor commit.
28
29 OPTIONS
30 -------
31 -\--all::
31 +--all::
32 Fetch all remote refs.
33
34 -\--quiet, \-q::
34 +-q::
35 +--quiet::
36 Pass '-q' flag to 'git-unpack-objects'; this makes the
37 cloning process less verbose.
38
38 -\--keep, \-k::
39 +-k::
40 +--keep::
41 Do not invoke 'git-unpack-objects' on received data, but
42 create a single packfile out of it instead, and store it
43 in the object database. If provided twice then the pack is
44 locked against repacking.
45
44 -\--thin::
46 +--thin::
47 Spend extra cycles to minimize the number of objects to be sent.
48 Use it on slower connection.
49
48 -\--include-tag::
50 +--include-tag::
51 If the remote side supports it, annotated tags objects will
52 be downloaded on the same connection as the other objects if
53 the object the tag references is downloaded. The caller must
54 otherwise determine the tags this option made available.
55
54 -\--upload-pack=<git-upload-pack>::
56 +--upload-pack=<git-upload-pack>::
57 Use this to specify the path to 'git-upload-pack' on the
58 remote side, if is not found on your $PATH.
59 Installations of sshd ignores the user's environment
@@ -63,16 +65,16 @@ OPTIONS
65 shells by having a lean .bashrc file (they set most of
66 the things up in .bash_profile).
67
66 -\--exec=<git-upload-pack>::
68 +--exec=<git-upload-pack>::
69 Same as \--upload-pack=<git-upload-pack>.
70
69 -\--depth=<n>::
71 +--depth=<n>::
72 Limit fetching to ancestor-chains not longer than n.
73
72 -\--no-progress::
74 +--no-progress::
75 Do not show the progress.
76
75 -\-v::
77 +-v::
78 Run verbosely.
79
80 <host>::
Documentation/git-filter-branch.txt
+2 -1
@@ -161,7 +161,8 @@ to other tags will be rewritten to point to the underlying commit.
161 does this in the '.git-rewrite/' directory but you can override
162 that choice by this parameter.
163
164 --f|--force::
164 +-f::
165 +--force::
166 `git filter-branch` refuses to start with an existing temporary
167 directory or when there are already refs starting with
168 'refs/original/', unless forced.
Documentation/git-fmt-merge-msg.txt
+4 -2
@@ -33,11 +33,13 @@ OPTIONS
33 Do not list one-line descriptions from the actual commits being
34 merged.
35
36 ---summary,--no-summary::
36 +--summary::
37 +--no-summary::
38 Synonyms to --log and --no-log; these are deprecated and will be
39 removed in the future.
40
40 ---file <file>, -F <file>::
41 +-F <file>::
42 +--file <file>::
43 Take the list of merged objects from <file> instead of
44 stdin.
45
Documentation/git-for-each-ref.txt
+4 -1
@@ -53,7 +53,10 @@ OPTIONS
53 literally, in the latter case matching completely or from the
54 beginning up to a slash.
55
56 ---shell, --perl, --python, --tcl::
56 +--shell::
57 +--perl::
58 +--python::
59 +--tcl::
60 If given, strings that substitute `%(fieldname)`
61 placeholders are quoted as string literals suitable for
62 the specified host language. This is meant to produce
Documentation/git-format-patch.txt
+10 -5
@@ -74,14 +74,17 @@ include::diff-options.txt[]
74 -<n>::
75 Limits the number of patches to prepare.
76
77 --o|--output-directory <dir>::
77 +-o <dir>::
78 +--output-directory <dir>::
79 Use <dir> to store the resulting files, instead of the
80 current working directory.
81
81 --n|--numbered::
82 +-n::
83 +--numbered::
84 Name output in '[PATCH n/m]' format.
85
84 --N|--no-numbered::
86 +-N::
87 +--no-numbered::
88 Name output in '[PATCH]' format.
89
90 --start-number <n>::
@@ -92,11 +95,13 @@ include::diff-options.txt[]
95 without the default first line of the commit appended.
96 Mutually exclusive with the --stdout option.
97
95 --k|--keep-subject::
98 +-k::
99 +--keep-subject::
100 Do not strip/add '[PATCH]' from the first line of the
101 commit log message.
102
99 --s|--signoff::
103 +-s::
104 +--signoff::
105 Add `Signed-off-by:` line to the commit message, using
106 the committer identity of yourself.
107
Documentation/git-grep.txt
+27 -10
@@ -33,25 +33,30 @@ OPTIONS
33 Instead of searching in the working tree files, check
34 the blobs registered in the index file.
35
36 --a | --text::
36 +-a::
37 +--text::
38 Process binary files as if they were text.
39
39 --i | --ignore-case::
40 +-i::
41 +--ignore-case::
42 Ignore case differences between the patterns and the
43 files.
44
45 -I::
46 Don't match the pattern in binary files.
47
46 --w | --word-regexp::
48 +-w::
49 +--word-regexp::
50 Match the pattern only at word boundary (either begin at the
51 beginning of a line, or preceded by a non-word character; end at
52 the end of a line or followed by a non-word character).
53
51 --v | --invert-match::
54 +-v::
55 +--invert-match::
56 Select non-matching lines.
57
54 --h | -H::
58 +-h::
59 +-H::
60 By default, the command shows the filename for each
61 match. `-h` option is used to suppress this output.
62 `-H` is there for completeness and does not do anything
@@ -64,24 +69,33 @@ OPTIONS
69 option forces paths to be output relative to the project
70 top directory.
71
67 --E | --extended-regexp | -G | --basic-regexp::
72 +-E::
73 +--extended-regexp::
74 +-G::
75 +--basic-regexp::
76 Use POSIX extended/basic regexp for patterns. Default
77 is to use basic regexp.
78
71 --F | --fixed-strings::
79 +-F::
80 +--fixed-strings::
81 Use fixed strings for patterns (don't interpret pattern
82 as a regex).
83
84 -n::
85 Prefix the line number to matching lines.
86
78 --l | --files-with-matches | --name-only | -L | --files-without-match::
87 +-l::
88 +--files-with-matches::
89 +--name-only::
90 +-L::
91 +--files-without-match::
92 Instead of showing every matched line, show only the
93 names of files that contain (or do not contain) matches.
94 For better compatibility with git-diff, --name-only is a
95 synonym for --files-with-matches.
96
84 --c | --count::
97 +-c::
98 +--count::
99 Instead of showing every matched line, show the number of
100 lines that match.
101
@@ -103,7 +117,10 @@ OPTIONS
117 scripts passing user input to grep. Multiple patterns are
118 combined by 'or'.
119
106 ---and | --or | --not | ( | )::
120 +--and::
121 +--or::
122 +--not::
123 +( ... )::
124 Specify how multiple patterns are combined using Boolean
125 expressions. `--or` is the default operator. `--and` has
126 higher precedence than `--or`. `-e` has to be used for all
Documentation/git-help.txt
+8 -4
@@ -28,15 +28,18 @@ former is internally converted into the latter.
28
29 OPTIONS
30 -------
31 --a|--all::
31 +-a::
32 +--all::
33 Prints all the available commands on the standard output. This
34 option supersedes any other option.
35
35 --i|--info::
36 +-i::
37 +--info::
38 Display manual page for the command in the 'info' format. The
39 'info' program will be used for that purpose.
40
39 --m|--man::
41 +-m::
42 +--man::
43 Display manual page for the command in the 'man' format. This
44 option may be used to override a value set in the
45 'help.format' configuration variable.
@@ -45,7 +48,8 @@ By default the 'man' program will be used to display the manual page,
48 but the 'man.viewer' configuration variable may be used to choose
49 other display programs (see below).
50
48 --w|--web::
51 +-w::
52 +--web::
53 Display manual page for the command in the 'web' (HTML)
54 format. A web browser will be used for that purpose.
55 +
Documentation/git-http-push.txt
+2 -1
@@ -40,7 +40,8 @@ OPTIONS
40 Report the list of objects being walked locally and the
41 list of objects successfully sent to the remote repository.
42
43 --d, -D::
43 +-d::
44 +-D::
45 Remove <ref> from remote repository. The specified branch
46 cannot be the remote HEAD. If -d is specified the following
47 other conditions must also be met:
Documentation/git-init.txt
+2 -1
@@ -16,7 +16,8 @@ OPTIONS
16
17 --
18
19 --q, \--quiet::
19 +-q::
20 +--quiet::
21
22 Only print error and warning messages, all other output will be suppressed.
23
Documentation/git-instaweb.txt
+10 -5
@@ -20,24 +20,29 @@ repository.
20 OPTIONS
21 -------
22
23 --l|--local::
23 +-l::
24 +--local::
25 Only bind the web server to the local IP (127.0.0.1).
26
26 --d|--httpd::
27 +-d::
28 +--httpd::
29 The HTTP daemon command-line that will be executed.
30 Command-line options may be specified here, and the
31 configuration file will be added at the end of the command-line.
32 Currently lighttpd, apache2 and webrick are supported.
33 (Default: lighttpd)
34
33 --m|--module-path::
35 +-m::
36 +--module-path::
37 The module path (only needed if httpd is Apache).
38 (Default: /usr/lib/apache2/modules)
39
37 --p|--port::
40 +-p::
41 +--port::
42 The port number to bind the httpd to. (Default: 1234)
43
40 --b|--browser::
44 +-b::
45 +--browser::
46 The web browser that should be used to view the gitweb
47 page. This will be passed to the 'git-web--browse' helper
48 script along with the URL of the gitweb instance. See
Documentation/git-ls-files.txt
+20 -10
@@ -30,23 +30,29 @@ shown:
30
31 OPTIONS
32 -------
33 --c|--cached::
33 +-c::
34 +--cached::
35 Show cached files in the output (default)
36
36 --d|--deleted::
37 +-d::
38 +--deleted::
39 Show deleted files in the output
40
39 --m|--modified::
41 +-m::
42 +--modified::
43 Show modified files in the output
44
42 --o|--others::
45 +-o::
46 +--others::
47 Show other files in the output
48
45 --i|--ignored::
49 +-i::
50 +--ignored::
51 Show ignored files in the output.
52 Note that this also reverses any exclude list present.
53
49 --s|--stage::
54 +-s::
55 +--stage::
56 Show stage files in the output
57
58 --directory::
@@ -56,10 +62,12 @@ OPTIONS
62 --no-empty-directory::
63 Do not list empty directories. Has no effect without --directory.
64
59 --u|--unmerged::
65 +-u::
66 +--unmerged::
67 Show unmerged files in the output (forces --stage)
68
62 --k|--killed::
69 +-k::
70 +--killed::
71 Show files on the filesystem that need to be removed due
72 to file/directory conflicts for checkout-index to
73 succeed.
@@ -67,11 +75,13 @@ OPTIONS
75 -z::
76 \0 line termination on output.
77
70 --x|--exclude=<pattern>::
78 +-x <pattern>::
79 +--exclude=<pattern>::
80 Skips files matching pattern.
81 Note that pattern is a shell wildcard pattern.
82
74 --X|--exclude-from=<file>::
83 +-X <file>::
84 +--exclude-from=<file>::
85 exclude patterns are read from <file>; 1 per line.
86
87 --exclude-per-directory=<file>::
Documentation/git-ls-remote.txt
+6 -2
@@ -20,13 +20,17 @@ commit IDs.
20
21 OPTIONS
22 -------
23 --h|--heads, -t|--tags::
23 +-h::
24 +--heads::
25 +-t::
26 +--tags::
27 Limit to only refs/heads and refs/tags, respectively.
28 These options are _not_ mutually exclusive; when given
29 both, references stored in refs/heads and refs/tags are
30 displayed.
31
29 --u <exec>, --upload-pack=<exec>::
32 +-u <exec>::
33 +--upload-pack=<exec>::
34 Specify the full path of linkgit:git-upload-pack[1] on the remote
35 host. This allows listing references from repositories accessed via
36 SSH and where the SSH daemon does not use the PATH configured by the
Documentation/git-mv.txt
+2 -1
@@ -34,7 +34,8 @@ OPTIONS
34 condition. An error happens when a source is neither existing nor
35 controlled by GIT, or when it would overwrite an existing
36 file unless '-f' is given.
37 --n, \--dry-run::
37 +-n::
38 +--dry-run::
39 Do nothing; only show what would happen
40
41
Documentation/git-pack-objects.txt
+2 -1
@@ -79,7 +79,8 @@ base-name::
79 reference was included in the resulting packfile. This
80 can be useful to send new tags to native git clients.
81
82 ---window=[N], --depth=[N]::
82 +--window=[N]::
83 +--depth=[N]::
84 These two options affect how the objects contained in
85 the pack are stored using delta compression. The
86 objects are first internally sorted by type, size and
Documentation/git-pack-refs.txt
+2 -2
@@ -42,7 +42,7 @@ unpacked.
42 OPTIONS
43 -------
44
45 -\--all::
45 +--all::
46
47 The command by default packs all tags and refs that are already
48 packed, and leaves other refs
@@ -51,7 +51,7 @@ developed and packing their tips does not help performance.
51 This option causes branch tips to be packed as well. Useful for
52 a repository with many branches of historical interests.
53
54 -\--no-prune::
54 +--no-prune::
55
56 The command usually removes loose refs under `$GIT_DIR/refs`
57 hierarchy after packing them. This option tells it not to.
Documentation/git-peek-remote.txt
+1 -1
@@ -16,7 +16,7 @@ This command is deprecated; use `git-ls-remote` instead.
16
17 OPTIONS
18 -------
19 -\--upload-pack=<git-upload-pack>::
19 +--upload-pack=<git-upload-pack>::
20 Use this to specify the path to 'git-upload-pack' on the
21 remote side, if it is not found on your $PATH. Some
22 installations of sshd ignores the user's environment
Documentation/git-prune.txt
+1 -1
@@ -37,7 +37,7 @@ OPTIONS
37 \--::
38 Do not interpret any more arguments as options.
39
40 -\--expire <time>::
40 +--expire <time>::
41 Only expire loose objects older than <time>.
42
43 <head>...::
Documentation/git-pull.txt
+3 -3
@@ -30,7 +30,7 @@ include::merge-options.txt[]
30
31 :git-pull: 1
32
33 -\--rebase::
33 +--rebase::
34 Instead of a merge, perform a rebase after fetching. If
35 there is a remote ref for the upstream branch, and this branch
36 was rebased since last fetched, the rebase uses that information
@@ -43,8 +43,8 @@ It rewrites history, which does not bode well when you
43 published that history already. Do *not* use this option
44 unless you have read linkgit:git-rebase[1] carefully.
45
46 -\--no-rebase::
47 - Override earlier \--rebase.
46 +--no-rebase::
47 + Override earlier --rebase.
48
49 include::fetch-options.txt[]
50
Documentation/git-push.txt
+13 -10
@@ -61,11 +61,11 @@ already exists on the remote side. This is the default operation mode
61 if no explicit refspec is found (that is neither on the command line
62 nor in any Push line of the corresponding remotes file---see below).
63
64 -\--all::
64 +--all::
65 Instead of naming each ref to push, specifies that all
66 refs under `$GIT_DIR/refs/heads/` be pushed.
67
68 -\--mirror::
68 +--mirror::
69 Instead of naming each ref to push, specifies that all
70 refs under `$GIT_DIR/refs/heads/` and `$GIT_DIR/refs/tags/`
71 be mirrored to the remote repository. Newly created local
@@ -75,39 +75,42 @@ nor in any Push line of the corresponding remotes file---see below).
75 if the configuration option `remote.<remote>.mirror` is
76 set.
77
78 -\--dry-run::
78 +--dry-run::
79 Do everything except actually send the updates.
80
81 -\--tags::
81 +--tags::
82 All refs under `$GIT_DIR/refs/tags` are pushed, in
83 addition to refspecs explicitly listed on the command
84 line.
85
86 -\--receive-pack=<git-receive-pack>::
86 +--receive-pack=<git-receive-pack>::
87 Path to the 'git-receive-pack' program on the remote
88 end. Sometimes useful when pushing to a remote
89 repository over ssh, and you do not have the program in
90 a directory on the default $PATH.
91
92 -\--exec=<git-receive-pack>::
92 +--exec=<git-receive-pack>::
93 Same as \--receive-pack=<git-receive-pack>.
94
95 --f, \--force::
95 +-f::
96 +--force::
97 Usually, the command refuses to update a remote ref that is
98 not an ancestor of the local ref used to overwrite it.
99 This flag disables the check. This can cause the
100 remote repository to lose commits; use it with care.
101
101 -\--repo=<repo>::
102 +--repo=<repo>::
103 When no repository is specified the command defaults to
104 "origin"; this overrides it.
105
105 -\--thin, \--no-thin::
106 +--thin::
107 +--no-thin::
108 These options are passed to `git-send-pack`. Thin
109 transfer spends extra cycles to minimize the number of
110 objects to be sent and meant to be used on slower connection.
111
110 --v, \--verbose::
112 +-v::
113 +--verbose::
114 Run verbosely.
115
116 include::urls-remotes.txt[]
Documentation/git-rebase.txt
+10 -5
@@ -213,19 +213,22 @@ OPTIONS
213 --skip::
214 Restart the rebasing process by skipping the current patch.
215
216 --m, \--merge::
216 +-m::
217 +--merge::
218 Use merging strategies to rebase. When the recursive (default) merge
219 strategy is used, this allows rebase to be aware of renames on the
220 upstream side.
221
221 --s <strategy>, \--strategy=<strategy>::
222 +-s <strategy>::
223 +--strategy=<strategy>::
224 Use the given merge strategy; can be supplied more than
225 once to specify them in the order they should be tried.
226 If there is no `-s` option, a built-in list of strategies
227 is used instead (`git-merge-recursive` when merging a single
228 head, `git-merge-octopus` otherwise). This implies --merge.
229
228 --v, \--verbose::
230 +-v::
231 +--verbose::
232 Display a diffstat of what changed upstream since the last rebase.
233
234 -C<n>::
@@ -238,12 +241,14 @@ OPTIONS
241 This flag is passed to the `git-apply` program
242 (see linkgit:git-apply[1]) that applies the patch.
243
241 --i, \--interactive::
244 +-i::
245 +--interactive::
246 Make a list of the commits which are about to be rebased. Let the
247 user edit that list before rebasing. This mode can also be used to
248 split commits (see SPLITTING COMMITS below).
249
246 --p, \--preserve-merges::
250 +-p::
251 +--preserve-merges::
252 Instead of ignoring merges, try to recreate them. This option
253 only works in interactive mode.
254
Documentation/git-repack.txt
+2 -1
@@ -73,7 +73,8 @@ OPTIONS
73 this repository (or a direct copy of it)
74 over HTTP or FTP. See gitlink:git-update-server-info[1].
75
76 ---window=[N], --depth=[N]::
76 +--window=[N]::
77 +--depth=[N]::
78 These two options affect how the objects contained in the pack are
79 stored using delta compression. The objects are first internally
80 sorted by type, size and optionally names and compared against the
Documentation/git-rev-parse.txt
+8 -4
@@ -52,7 +52,8 @@ OPTIONS
52 The parameter given must be usable as a single, valid
53 object name. Otherwise barf and abort.
54
55 --q, --quiet::
55 +-q::
56 +--quiet::
57 Only meaningful in `--verify` mode. Do not output an error
58 message if the first argument is not a valid object name;
59 instead exit with non-zero status silently.
@@ -119,16 +120,19 @@ OPTIONS
120 --is-bare-repository::
121 When the repository is bare print "true", otherwise "false".
122
122 ---short, --short=number::
123 +--short::
124 +--short=number::
125 Instead of outputting the full SHA1 values of object names try to
126 abbreviate them to a shorter unique name. When no length is specified
127 7 is used. The minimum length is 4.
128
127 ---since=datestring, --after=datestring::
129 +--since=datestring::
130 +--after=datestring::
131 Parses the date string, and outputs corresponding
132 --max-age= parameter for git-rev-list command.
133
131 ---until=datestring, --before=datestring::
134 +--until=datestring::
135 +--before=datestring::
136 Parses the date string, and outputs corresponding
137 --min-age= parameter for git-rev-list command.
138
Documentation/git-revert.txt
+8 -4
@@ -22,12 +22,14 @@ OPTIONS
22 For a more complete list of ways to spell commit names, see
23 "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
24
25 --e|--edit::
25 +-e::
26 +--edit::
27 With this option, `git-revert` will let you edit the commit
28 message prior to committing the revert. This is the default if
29 you run the command from a terminal.
30
30 --m parent-number|--mainline parent-number::
31 +-m parent-number::
32 +--mainline parent-number::
33 Usually you cannot revert a merge because you do not know which
34 side of the merge should be considered the mainline. This
35 option specifies the parent number (starting from 1) of
@@ -38,7 +40,8 @@ OPTIONS
40 With this option, `git-revert` will not start the commit
41 message editor.
42
41 --n|--no-commit::
43 +-n::
44 +--no-commit::
45 Usually the command automatically creates a commit with
46 a commit log message stating which commit was reverted.
47 This flag applies the change necessary to revert the
@@ -51,7 +54,8 @@ OPTIONS
54 This is useful when reverting more than one commits'
55 effect to your working tree in a row.
56
54 --s|--signoff::
57 +-s::
58 +--signoff::
59 Add Signed-off-by line at the end of the commit message.
60
61
Documentation/git-rm.txt
+6 -4
@@ -38,7 +38,8 @@ OPTIONS
38 -f::
39 Override the up-to-date check.
40
41 --n, \--dry-run::
41 +-n::
42 +--dry-run::
43 Don't actually remove any file(s). Instead, just show
44 if they exist in the index and would otherwise be removed
45 by the command.
@@ -52,15 +53,16 @@ OPTIONS
53 the list of files, (useful when filenames might be mistaken
54 for command-line options).
55
55 -\--cached::
56 +--cached::
57 Use this option to unstage and remove paths only from the index.
58 Working tree files, whether modified or not, will be
59 left alone.
60
60 -\--ignore-unmatch::
61 +--ignore-unmatch::
62 Exit with a zero status even if no files matched.
63
63 --q, \--quiet::
64 +-q::
65 +--quiet::
66 git-rm normally outputs one line (in the form of an "rm" command)
67 for each file removed. This option suppresses that output.
68
Documentation/git-send-email.txt
+8 -4
@@ -40,7 +40,8 @@ The --cc option must be repeated for each user you want on the cc list.
40 Output of this command must be single email address per line.
41 Default is the value of 'sendemail.cccmd' configuration value.
42
43 ---chain-reply-to, --no-chain-reply-to::
43 +--chain-reply-to::
44 +--no-chain-reply-to::
45 If this is set, each email will be sent as a reply to the previous
46 email sent. If disabled with "--no-chain-reply-to", all emails after
47 the first will be sent as replies to the first email sent. When using
@@ -65,7 +66,8 @@ The --cc option must be repeated for each user you want on the cc list.
66 Only necessary if --compose is also set. If --compose
67 is not set, this will be prompted for.
68
68 ---signed-off-by-cc, --no-signed-off-by-cc::
69 +--signed-off-by-cc::
70 +--no-signed-off-by-cc::
71 If this is set, add emails found in Signed-off-by: or Cc: lines to the
72 cc list.
73 Default is the value of 'sendemail.signedoffcc' configuration value;
@@ -141,7 +143,8 @@ user is prompted for a password while the input is masked for privacy.
143 Only necessary if --compose is also set. If --compose
144 is not set, this will be prompted for.
145
144 ---suppress-from, --no-suppress-from::
146 +--suppress-from::
147 +--no-suppress-from::
148 If this is set, do not add the From: address to the cc: list.
149 Default is the value of 'sendemail.suppressfrom' configuration value;
150 if that is unspecified, default to --no-suppress-from.
@@ -157,7 +160,8 @@ user is prompted for a password while the input is masked for privacy.
160 if that is unspecified, default to 'self' if --suppress-from is
161 specified, as well as 'sob' if --no-signed-off-cc is specified.
162
160 ---thread, --no-thread::
163 +--thread::
164 +--no-thread::
165 If this is set, the In-Reply-To header will be set on each email sent.
166 If disabled with "--no-thread", no emails will have the In-Reply-To
167 header set.
Documentation/git-send-pack.txt
+7 -7
@@ -21,33 +21,33 @@ updates it from the current repository, sending named refs.
21
22 OPTIONS
23 -------
24 -\--receive-pack=<git-receive-pack>::
24 +--receive-pack=<git-receive-pack>::
25 Path to the 'git-receive-pack' program on the remote
26 end. Sometimes useful when pushing to a remote
27 repository over ssh, and you do not have the program in
28 a directory on the default $PATH.
29
30 -\--exec=<git-receive-pack>::
30 +--exec=<git-receive-pack>::
31 Same as \--receive-pack=<git-receive-pack>.
32
33 -\--all::
33 +--all::
34 Instead of explicitly specifying which refs to update,
35 update all heads that locally exist.
36
37 -\--dry-run::
37 +--dry-run::
38 Do everything except actually send the updates.
39
40 -\--force::
40 +--force::
41 Usually, the command refuses to update a remote ref that
42 is not an ancestor of the local ref used to overwrite it.
43 This flag disables the check. What this means is that
44 the remote repository can lose commits; use it with
45 care.
46
47 -\--verbose::
47 +--verbose::
48 Run verbosely.
49
50 -\--thin::
50 +--thin::
51 Spend extra cycles to minimize the number of objects to be sent.
52 Use it on slower connection.
53
Documentation/git-shortlog.txt
+8 -4
@@ -22,17 +22,21 @@ Additionally, "[PATCH]" will be stripped from the commit description.
22 OPTIONS
23 -------
24
25 --h, \--help::
25 +-h::
26 +--help::
27 Print a short usage message and exit.
28
28 --n, \--numbered::
29 +-n::
30 +--numbered::
31 Sort output according to the number of commits per author instead
32 of author alphabetic order.
33
32 --s, \--summary::
34 +-s::
35 +--summary::
36 Suppress commit description and provide a commit count summary only.
37
35 --e, \--email::
38 +-e::
39 +--email::
40 Show the email address of each author.
41
42 -w[<width>[,<indent1>[,<indent2>]]]::
Documentation/git-show-branch.txt
+4 -2
@@ -38,10 +38,12 @@ OPTIONS
38 branches under $GIT_DIR/refs/heads/topic, giving
39 `topic/*` would show all of them.
40
41 --r|--remotes::
41 +-r::
42 +--remotes::
43 Show the remote-tracking branches.
44
44 --a|--all::
45 +-a::
46 +--all::
47 Show both remote-tracking branches and local branches.
48
49 --current::
Documentation/git-show-ref.txt
+14 -7
@@ -29,22 +29,26 @@ in the `.git` directory.
29 OPTIONS
30 -------
31
32 --h, --head::
32 +-h::
33 +--head::
34
35 Show the HEAD reference.
36
36 ---tags, --heads::
37 +--tags::
38 +--heads::
39
40 Limit to only "refs/heads" and "refs/tags", respectively. These
41 options are not mutually exclusive; when given both, references stored
42 in "refs/heads" and "refs/tags" are displayed.
43
42 --d, --dereference::
44 +-d::
45 +--dereference::
46
47 Dereference tags into object IDs as well. They will be shown with "^{}"
48 appended.
49
47 --s, --hash::
50 +-s::
51 +--hash::
52
53 Only show the SHA1 hash, not the reference name. When also using
54 --dereference the dereferenced tag will still be shown after the SHA1.
@@ -55,17 +59,20 @@ OPTIONS
59 Aside from returning an error code of 1, it will also print an error
60 message if '--quiet' was not specified.
61
58 ---abbrev, --abbrev=len::
62 +--abbrev::
63 +--abbrev=len::
64
65 Abbreviate the object name. When using `--hash`, you do
66 not have to say `--hash --abbrev`; `--hash=len` would do.
67
63 --q, --quiet::
68 +-q::
69 +--quiet::
70
71 Do not print any results to stdout. When combined with '--verify' this
72 can be used to silently check if a reference exists.
73
68 ---exclude-existing, --exclude-existing=pattern::
74 +--exclude-existing::
75 +--exclude-existing=pattern::
76
77 Make git-show-ref act as a filter that reads refs from stdin of the
78 form "^(?:<anything>\s)?<refname>(?:\^\{\})?$" and performs the
Documentation/git-stripspace.txt
+2 -1
@@ -16,7 +16,8 @@ Remove multiple empty lines, and empty lines at beginning and end.
16
17 OPTIONS
18 -------
19 --s|--strip-comments::
19 +-s::
20 +--strip-comments::
21 In addition to empty lines, also strip lines starting with '#'.
22
23 <stream>::
Documentation/git-submodule.txt
+6 -3
@@ -61,10 +61,12 @@ summary::
61
62 OPTIONS
63 -------
64 --q, --quiet::
64 +-q::
65 +--quiet::
66 Only print error messages.
67
67 --b, --branch::
68 +-b::
69 +--branch::
70 Branch of repository to add as submodule.
71
72 --cached::
@@ -72,7 +74,8 @@ OPTIONS
74 commands typically use the commit found in the submodule HEAD, but
75 with this option, the commit stored in the index is used instead.
76
75 --n, --summary-limit::
77 +-n::
78 +--summary-limit::
79 This option is only valid for the summary command.
80 Limit the summary size (number of commits shown in total).
81 Giving 0 will disable the summary; a negative number means unlimited
Documentation/git-symbolic-ref.txt
+2 -1
@@ -26,7 +26,8 @@ a regular file whose contents is `ref: refs/heads/master`.
26 OPTIONS
27 -------
28
29 --q, --quiet::
29 +-q::
30 +--quiet::
31 Do not issue an error message if the <name> is not a
32 symbolic ref but a detached HEAD; instead exit with
33 non-zero status silently.
Documentation/git-update-index.txt
+4 -2
@@ -76,7 +76,8 @@ OPTIONS
76 --chmod=(+|-)x::
77 Set the execute permissions on the updated files.
78
79 ---assume-unchanged, --no-assume-unchanged::
79 +--assume-unchanged::
80 +--no-assume-unchanged::
81 When these flags are specified, the object name recorded
82 for the paths are not updated. Instead, these options
83 sets and unsets the "assume unchanged" bit for the
@@ -88,7 +89,8 @@ OPTIONS
89 filesystem that has very slow lstat(2) system call
90 (e.g. cifs).
91
91 ---again, -g::
92 +-g::
93 +--again::
94 Runs `git-update-index` itself on the paths whose index
95 entries are different from those from the `HEAD` commit.
96
Documentation/git-update-server-info.txt
+2 -1
@@ -22,7 +22,8 @@ generates such auxiliary files.
22 OPTIONS
23 -------
24
25 --f|--force::
25 +-f::
26 +--force::
27 Update the info files from scratch.
28
29
Documentation/git-upload-pack.txt
+2 -2
@@ -24,10 +24,10 @@ repository. For push operations, see 'git-send-pack'.
24 OPTIONS
25 -------
26
27 -\--strict::
27 +--strict::
28 Do not try <directory>/.git/ if <directory> is no git directory.
29
30 -\--timeout=<n>::
30 +--timeout=<n>::
31 Interrupt transfer after <n> seconds of inactivity.
32
33 <directory>::
Documentation/git-web--browse.txt
+6 -3
@@ -31,14 +31,17 @@ Custom commands may also be specified.
31
32 OPTIONS
33 -------
34 --b BROWSER|--browser=BROWSER::
34 +-b BROWSER::
35 +--browser=BROWSER::
36 Use the specified BROWSER. It must be in the list of supported
37 browsers.
38
38 --t BROWSER|--tool=BROWSER::
39 +-t BROWSER::
40 +--tool=BROWSER::
41 Same as above.
42
41 --c CONF.VAR|--config=CONF.VAR::
43 +-c CONF.VAR::
44 +--config=CONF.VAR::
45 CONF.VAR is looked up in the git config files. If it's set,
46 then its value specify the browser that should be used.
47
Documentation/git.txt
+2 -1
@@ -138,7 +138,8 @@ help ...'.
138 environment variable. If no path is given 'git' will print
139 the current setting and then exit.
140
141 --p|--paginate::
141 +-p::
142 +--paginate::
143 Pipe all output into 'less' (or if set, $PAGER).
144
145 --no-pager::
Documentation/gitk.txt
+2 -1
@@ -25,7 +25,8 @@ To control which revisions to shown, the command takes options applicable to
25 the linkgit:git-rev-list[1] command. This manual page describes only the most
26 frequently used options.
27
28 --n <number>, --max-count=<number>::
28 +-n <number>::
29 +--max-count=<number>::
30
31 Limits the number of commits to show.
32
Documentation/merge-options.txt
+6 -3
@@ -2,10 +2,12 @@
2 Show a diffstat at the end of the merge. The diffstat is also
3 controlled by the configuration option merge.stat.
4
5 --n, \--no-stat::
5 +-n::
6 +--no-stat::
7 Do not show diffstat at the end of the merge.
8
8 ---summary, \--no-summary::
9 +--summary::
10 +--no-summary::
11 Synonyms to --stat and --no-stat; these are deprecated and will be
12 removed in the future.
13
@@ -49,7 +51,8 @@
51 a fast-forward, only update the branch pointer. This is
52 the default behavior of git-merge.
53
52 --s <strategy>, \--strategy=<strategy>::
54 +-s <strategy>::
55 +--strategy=<strategy>::
56 Use the given merge strategy; can be supplied more than
57 once to specify them in the order they should be tried.
58 If there is no `-s` option, a built-in list of strategies
Documentation/rev-list-options.txt
+20 -10
@@ -129,7 +129,8 @@ limiting may be applied.
129
130 --
131
132 --n 'number', --max-count='number'::
132 +-n 'number'::
133 +--max-count='number'::
134
135 Limit the number of commits output.
136
@@ -137,21 +138,25 @@ limiting may be applied.
138
139 Skip 'number' commits before starting to show the commit output.
140
140 ---since='date', --after='date'::
141 +--since='date'::
142 +--after='date'::
143
144 Show commits more recent than a specific date.
145
144 ---until='date', --before='date'::
146 +--until='date'::
147 +--before='date'::
148
149 Show commits older than a specific date.
150
151 ifdef::git-rev-list[]
149 ---max-age='timestamp', --min-age='timestamp'::
152 +--max-age='timestamp'::
153 +--min-age='timestamp'::
154
155 Limit the commits output to specified time range.
156 endif::git-rev-list[]
157
154 ---author='pattern', --committer='pattern'::
158 +--author='pattern'::
159 +--committer='pattern'::
160
161 Limit the commits output to ones with author/committer
162 header lines that match the specified pattern (regular expression).
@@ -161,16 +166,19 @@ endif::git-rev-list[]
166 Limit the commits output to ones with log message that
167 matches the specified pattern (regular expression).
168
164 --i, --regexp-ignore-case::
169 +-i::
170 +--regexp-ignore-case::
171
172 Match the regexp limiting patterns without regard to letters case.
173
168 --E, --extended-regexp::
174 +-E::
175 +--extended-regexp::
176
177 Consider the limiting patterns to be extended regular expressions
178 instead of the default basic regular expressions.
179
173 --F, --fixed-strings::
180 +-F::
181 +--fixed-strings::
182
183 Consider the limiting patterns to be fixed strings (don't interpret
184 pattern as a regular expression).
@@ -239,7 +247,8 @@ from the other branch (for example, "3rd on b" may be cherry-picked
247 from branch A). With this option, such pairs of commits are
248 excluded from the output.
249
242 --g, --walk-reflogs::
250 +-g::
251 +--walk-reflogs::
252
253 Instead of walking the commit ancestry chain, walk
254 reflog entries from the most recent one to older ones.
@@ -268,7 +277,8 @@ See also linkgit:git-reflog[1].
277 Output uninteresting commits at the boundary, which are usually
278 not shown.
279
271 ---dense, --sparse::
280 +--dense::
281 +--sparse::
282
283 When optional paths are given, the default behaviour ('--dense') is to
284 only output commits that changes at least one of them, and also ignore