doc: typeset long command-line options as literal
Similarly to the previous commit, use backquotes instead of forward-quotes, for long options. This was obtained with: perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt and manual tweak to remove false positive in ascii-art (o'--o'--o' to describe rewritten history). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Jun 28, 2016 at 13:40 UTC
bcf9626a71a0d90be65acc265ad0ec488d95d6ed
46 files changed
+149
-149
Documentation/config.txt
+16
-16
@@ -140,7 +140,7 @@ boolean::
140
false;; Boolean false can be spelled as `no`, `off`,
141
`false`, or `0`.
142
+
143
-When converting value to the canonical form using '--bool' type
143
+When converting value to the canonical form using `--bool` type
144
specifier; 'git config' will ensure that the output is "true" or
145
"false" (spelled in lowercase).
146
@@ -481,7 +481,7 @@ core.worktree::
481
If `GIT_COMMON_DIR` environment variable is set, core.worktree
482
is ignored and not used for determining the root of working tree.
483
This can be overridden by the `GIT_WORK_TREE` environment
484
- variable and the '--work-tree' command-line option.
484
+ variable and the `--work-tree` command-line option.
485
The value can be an absolute path or relative to the path to
486
the .git directory, which is either specified by --git-dir
487
or GIT_DIR, or automatically discovered.
@@ -762,7 +762,7 @@ core.abbrev::
762
add.ignoreErrors::
763
add.ignore-errors (deprecated)::
764
Tells 'git add' to continue adding files when some files cannot be
765
- added due to indexing errors. Equivalent to the '--ignore-errors'
765
+ added due to indexing errors. Equivalent to the `--ignore-errors`
766
option of linkgit:git-add[1]. `add.ignore-errors` is deprecated,
767
as it does not follow the usual naming convention for configuration
768
variables.
@@ -788,9 +788,9 @@ from the original current directory. See linkgit:git-rev-parse[1].
788
789
am.keepcr::
790
If true, git-am will call git-mailsplit for patches in mbox format
791
- with parameter '--keep-cr'. In this case git-mailsplit will
791
+ with parameter `--keep-cr`. In this case git-mailsplit will
792
not remove `\r` from lines ending with `\r\n`. Can be overridden
793
- by giving '--no-keep-cr' from the command line.
793
+ by giving `--no-keep-cr` from the command line.
794
See linkgit:git-am[1], linkgit:git-mailsplit[1].
795
796
am.threeWay::
@@ -803,7 +803,7 @@ am.threeWay::
803
804
apply.ignoreWhitespace::
805
When set to 'change', tells 'git apply' to ignore changes in
806
- whitespace, in the same way as the '--ignore-space-change'
806
+ whitespace, in the same way as the `--ignore-space-change`
807
option.
808
When set to one of: no, none, never, false tells 'git apply' to
809
respect all whitespace differences.
@@ -811,7 +811,7 @@ apply.ignoreWhitespace::
811
812
apply.whitespace::
813
Tells 'git apply' how to handle whitespaces, in the same way
814
- as the '--whitespace' option. See linkgit:git-apply[1].
814
+ as the `--whitespace` option. See linkgit:git-apply[1].
815
816
branch.autoSetupMerge::
817
Tells 'git branch' and 'git checkout' to set up new branches
@@ -1470,12 +1470,12 @@ grep.lineNumber::
1470
1471
grep.patternType::
1472
Set the default matching behavior. Using a value of 'basic', 'extended',
1473
- 'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
1474
- '--fixed-strings', or '--perl-regexp' option accordingly, while the
1473
+ 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
1474
+ `--fixed-strings`, or `--perl-regexp` option accordingly, while the
1475
value 'default' will return to the default matching behavior.
1476
1477
grep.extendedRegexp::
1478
- If set to true, enable '--extended-regexp' option by default. This
1478
+ If set to true, enable `--extended-regexp` option by default. This
1479
option is ignored when the `grep.patternType` option is set to a value
1480
other than 'default'.
1481
@@ -1916,7 +1916,7 @@ log.decorate::
1916
command. If 'short' is specified, the ref name prefixes 'refs/heads/',
1917
'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
1918
specified, the full ref name (including prefix) will be printed.
1919
- This is the same as the log commands '--decorate' option.
1919
+ This is the same as the log commands `--decorate` option.
1920
1921
log.follow::
1922
If `true`, `git log` will act as if the `--follow` option was used when
@@ -2298,16 +2298,16 @@ new default).
2298
--
2299
2300
push.followTags::
2301
- If set to true enable '--follow-tags' option by default. You
2301
+ If set to true enable `--follow-tags` option by default. You
2302
may override this configuration at time of push by specifying
2303
- '--no-follow-tags'.
2303
+ `--no-follow-tags`.
2304
2305
push.gpgSign::
2306
May be set to a boolean value, or the string 'if-asked'. A true
2307
- value causes all pushes to be GPG signed, as if '--signed' is
2307
+ value causes all pushes to be GPG signed, as if `--signed` is
2308
passed to linkgit:git-push[1]. The string 'if-asked' causes
2309
pushes to be signed if the server supports it, as if
2310
- '--signed=if-asked' is passed to 'git push'. A false value may
2310
+ `--signed=if-asked` is passed to 'git push'. A false value may
2311
override a value from a lower-priority config file. An explicit
2312
command-line flag always overrides this config option.
2313
@@ -2330,7 +2330,7 @@ rebase.stat::
2330
rebase. False by default.
2331
2332
rebase.autoSquash::
2333
- If set to true enable '--autosquash' option by default.
2333
+ If set to true enable `--autosquash` option by default.
2334
2335
rebase.autoStash::
2336
When set to true, automatically create a temporary stash
Documentation/diff-format.txt
+1
-1
@@ -86,7 +86,7 @@ diff format for merges
86
----------------------
87
88
"git-diff-tree", "git-diff-files" and "git-diff --raw"
89
-can take `-c` or '--cc' option
89
+can take `-c` or `--cc` option
90
to generate diff output also for merge commits. The output differs
91
from the format described above in the following way:
92
Documentation/diff-generate-patch.txt
+2
-2
@@ -2,7 +2,7 @@ Generating patches with -p
2
--------------------------
3
4
When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
5
-with a `-p` option, "git diff" without the '--raw' option, or
5
+with a `-p` option, "git diff" without the `--raw` option, or
6
"git log" with the "-p" option, they
7
do not produce the output described above; instead they produce a
8
patch file. You can customize the creation of such patches via the
@@ -118,7 +118,7 @@ index fabadb8,cc95eb0..4866510
118
119
diff --combined file
120
+
121
-or like this (when '--cc' option is used):
121
+or like this (when `--cc` option is used):
122
123
diff --cc file
124
Documentation/fetch-options.txt
+3
-3
@@ -88,7 +88,7 @@ ifndef::git-pull[]
88
to whatever else would otherwise be fetched. Using this
89
option alone does not subject tags to pruning, even if --prune
90
is used (though tags may be pruned anyway if they are also the
91
- destination of an explicit refspec; see '--prune').
91
+ destination of an explicit refspec; see `--prune`).
92
93
--recurse-submodules[=yes|on-demand|no]::
94
This option controls if and under what conditions new commits of
@@ -110,7 +110,7 @@ ifndef::git-pull[]
110
111
--no-recurse-submodules::
112
Disable recursive fetching of submodules (this has the same effect as
113
- using the '--recurse-submodules=no' option).
113
+ using the `--recurse-submodules=no` option).
114
115
--submodule-prefix=<path>::
116
Prepend <path> to paths printed in informative messages
@@ -137,7 +137,7 @@ endif::git-pull[]
137
138
--upload-pack <upload-pack>::
139
When given, and the repository to fetch from is handled
140
- by 'git fetch-pack', '--exec=<upload-pack>' is passed to
140
+ by 'git fetch-pack', `--exec=<upload-pack>` is passed to
141
the command to specify non-default path for the command
142
run on the other end.
143
Documentation/git-am.txt
+2
-2
@@ -198,12 +198,12 @@ When initially invoking `git am`, you give it the names of the mailboxes
198
to process. Upon seeing the first patch that does not apply, it
199
aborts in the middle. You can recover from this in one of two ways:
200
201
-. skip the current patch by re-running the command with the '--skip'
201
+. skip the current patch by re-running the command with the `--skip`
202
option.
203
204
. hand resolve the conflict in the working directory, and update
205
the index file to bring it into a state that the patch should
206
- have produced. Then run the command with the '--continue' option.
206
+ have produced. Then run the command with the `--continue` option.
207
208
The command refuses to process new mailboxes until the current
209
operation is finished, so if you decide to start over from scratch,
Documentation/git-branch.txt
+1
-1
@@ -172,7 +172,7 @@ This option is only applicable in non-verbose mode.
172
+
173
This behavior is the default when the start point is a remote-tracking branch.
174
Set the branch.autoSetupMerge configuration variable to `false` if you
175
-want `git checkout` and `git branch` to always behave as if '--no-track'
175
+want `git checkout` and `git branch` to always behave as if `--no-track`
176
were given. Set it to `always` if you want this behavior when the
177
start-point is either a local or remote-tracking branch.
178
Documentation/git-cat-file.txt
+1
-1
@@ -16,7 +16,7 @@ DESCRIPTION
16
-----------
17
In its first form, the command provides the content or the type of an object in
18
the repository. The type is required unless `-t` or `-p` is used to find the
19
-object type, or `-s` is used to find the object size, or '--textconv' is used
19
+object type, or `-s` is used to find the object size, or `--textconv` is used
20
(which implies type "blob").
21
22
In the second form, a list of objects (separated by linefeeds) is provided on
Documentation/git-cherry-pick.txt
+1
-1
@@ -47,7 +47,7 @@ OPTIONS
47
For a more complete list of ways to spell commits, see
48
linkgit:gitrevisions[7].
49
Sets of commits can be passed but no traversal is done by
50
- default, as if the '--no-walk' option was specified, see
50
+ default, as if the `--no-walk` option was specified, see
51
linkgit:git-rev-list[1]. Note that specifying a range will
52
feed all <commit>... arguments to a single revision walk
53
(see a later example that uses 'maint master..next').
Documentation/git-commit.txt
+1
-1
@@ -260,7 +260,7 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
260
staged for other paths. This is the default mode of operation of
261
'git commit' if any paths are given on the command line,
262
in which case this option can be omitted.
263
- If this option is specified together with '--amend', then
263
+ If this option is specified together with `--amend`, then
264
no paths need to be specified, which can be used to amend
265
the last commit without committing changes that have
266
already been staged.
Documentation/git-config.txt
+13
-13
@@ -31,29 +31,29 @@ You can query/set/replace/unset options with this command. The name is
31
actually the section and the key separated by a dot, and the value will be
32
escaped.
33
34
-Multiple lines can be added to an option by using the '--add' option.
34
+Multiple lines can be added to an option by using the `--add` option.
35
If you want to update or unset an option which can occur on multiple
36
lines, a POSIX regexp `value_regex` needs to be given. Only the
37
existing values that match the regexp are updated or unset. If
38
you want to handle the lines that do *not* match the regex, just
39
prepend a single exclamation mark in front (see also <<EXAMPLES>>).
40
41
-The type specifier can be either '--int' or '--bool', to make
41
+The type specifier can be either `--int` or `--bool`, to make
42
'git config' ensure that the variable(s) are of the given type and
43
convert the value to the canonical form (simple decimal number for int,
44
-a "true" or "false" string for bool), or '--path', which does some
45
-path expansion (see '--path' below). If no type specifier is passed, no
44
+a "true" or "false" string for bool), or `--path`, which does some
45
+path expansion (see `--path` below). If no type specifier is passed, no
46
checks or transformations are performed on the value.
47
48
When reading, the values are read from the system, global and
49
repository local configuration files by default, and options
50
-'--system', '--global', '--local' and '--file <filename>' can be
50
+`--system`, `--global`, `--local` and '--file <filename>' can be
51
used to tell the command to read from only that location (see <<FILES>>).
52
53
When writing, the new value is written to the repository local
54
-configuration file by default, and options '--system', '--global',
54
+configuration file by default, and options `--system`, `--global`,
55
'--file <filename>' can be used to tell the command to write to
56
-that location (you can say '--local' but that is the default).
56
+that location (you can say `--local` but that is the default).
57
58
This command will fail with non-zero status upon error. Some exit
59
codes are:
@@ -138,7 +138,7 @@ See also <<FILES>>.
138
Use the given config file instead of the one specified by GIT_CONFIG.
139
140
--blob blob::
141
- Similar to '--file' but use the given blob instead of a file. E.g.
141
+ Similar to `--file` but use the given blob instead of a file. E.g.
142
you can use 'master:.gitmodules' to read values from the file
143
'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
144
section in linkgit:gitrevisions[7] for a more complete list of
@@ -220,7 +220,7 @@ See also <<FILES>>.
220
-e::
221
--edit::
222
Opens an editor to modify the specified config file; either
223
- '--system', '--global', or repository (default).
223
+ `--system`, `--global`, or repository (default).
224
225
--[no-]includes::
226
Respect `include.*` directives in config files when looking up
@@ -232,7 +232,7 @@ See also <<FILES>>.
232
FILES
233
-----
234
235
-If not set explicitly with '--file', there are four files where
235
+If not set explicitly with `--file`, there are four files where
236
'git config' will search for configuration options:
237
238
$(prefix)/etc/gitconfig::
@@ -264,11 +264,11 @@ precedence over values read earlier. When multiple values are taken then all
264
values of a key from all files will be used.
265
266
All writing options will per default write to the repository specific
267
-configuration file. Note that this also affects options like '--replace-all'
268
-and '--unset'. *'git config' will only ever change one file at a time*.
267
+configuration file. Note that this also affects options like `--replace-all`
268
+and `--unset`. *'git config' will only ever change one file at a time*.
269
270
You can override these rules either by command-line options or by environment
271
-variables. The '--global' and the '--system' options will limit the file used
271
+variables. The `--global` and the `--system` options will limit the file used
272
to the global or system-wide file respectively. The `GIT_CONFIG` environment
273
variable has a similar effect, but you can specify any filename you want.
274
Documentation/git-credential-store.txt
+1
-1
@@ -44,7 +44,7 @@ OPTIONS
44
FILES
45
-----
46
47
-If not set explicitly with '--file', there are two files where
47
+If not set explicitly with `--file`, there are two files where
48
git-credential-store will search for credentials in order of precedence:
49
50
~/.git-credentials::
Documentation/git-cvsserver.txt
+1
-1
@@ -54,7 +54,7 @@ Print usage information and exit
54
You can specify a list of allowed directories. If no directories
55
are given, all are allowed. This is an additional restriction, gitcvs
56
access still needs to be enabled by the `gitcvs.enabled` config option
57
-unless '--export-all' was given, too.
57
+unless `--export-all` was given, too.
58
59
60
DESCRIPTION
Documentation/git-daemon.txt
+3
-3
@@ -30,7 +30,7 @@ that service if it is enabled.
30
31
It verifies that the directory has the magic file "git-daemon-export-ok", and
32
it will refuse to export any Git directory that hasn't explicitly been marked
33
-for export this way (unless the '--export-all' parameter is specified). If you
33
+for export this way (unless the `--export-all` parameter is specified). If you
34
pass some directory paths as 'git daemon' arguments, you can further restrict
35
the offers to a whitelist comprising of those.
36
@@ -90,10 +90,10 @@ OPTIONS
90
is not supported, then --listen=hostname is also not supported and
91
--listen must be given an IPv4 address.
92
Can be given more than once.
93
- Incompatible with '--inetd' option.
93
+ Incompatible with `--inetd` option.
94
95
--port=<n>::
96
- Listen on an alternative port. Incompatible with '--inetd' option.
96
+ Listen on an alternative port. Incompatible with `--inetd` option.
97
98
--init-timeout=<n>::
99
Timeout (in seconds) between the moment the connection is established
Documentation/git-describe.txt
+1
-1
@@ -154,7 +154,7 @@ is found, its name will be output and searching will stop.
154
If an exact match was not found, 'git describe' will walk back
155
through the commit history to locate an ancestor commit which
156
has been tagged. The ancestor's tag will be output along with an
157
-abbreviation of the input commit-ish's SHA-1. If '--first-parent' was
157
+abbreviation of the input commit-ish's SHA-1. If `--first-parent` was
158
specified then the walk will only consider the first parent of each
159
commit.
160
Documentation/git-diff-index.txt
+2
-2
@@ -40,13 +40,13 @@ include::diff-format.txt[]
40
Operating Modes
41
---------------
42
You can choose whether you want to trust the index file entirely
43
-(using the '--cached' flag) or ask the diff logic to show any files
43
+(using the `--cached` flag) or ask the diff logic to show any files
44
that don't match the stat state as being "tentatively changed". Both
45
of these operations are very useful indeed.
46
47
Cached Mode
48
-----------
49
-If '--cached' is specified, it allows you to ask:
49
+If `--cached` is specified, it allows you to ask:
50
51
show me the differences between HEAD and the current index
52
contents (the ones I'd write using 'git write-tree')
Documentation/git-diff-tree.txt
+3
-3
@@ -43,11 +43,11 @@ include::diff-options.txt[]
43
show tree entry itself as well as subtrees. Implies -r.
44
45
--root::
46
- When '--root' is specified the initial commit will be shown as a big
46
+ When `--root` is specified the initial commit will be shown as a big
47
creation event. This is equivalent to a diff against the NULL tree.
48
49
--stdin::
50
- When '--stdin' is specified, the command does not take
50
+ When `--stdin` is specified, the command does not take
51
<tree-ish> arguments from the command line. Instead, it
52
reads lines containing either two <tree>, one <commit>, or a
53
list of <commit> from its standard input. (Use a single space
@@ -91,7 +91,7 @@ include::pretty-options.txt[]
91
-c::
92
This flag changes the way a merge commit is displayed
93
(which means it is useful only when the command is given
94
- one <tree-ish>, or '--stdin'). It shows the differences
94
+ one <tree-ish>, or `--stdin`). It shows the differences
95
from each of the parents to the merge result simultaneously
96
instead of showing pairwise diff between a parent and the
97
result one at a time (which is what the `-m` option does).
Documentation/git-difftool.txt
+1
-1
@@ -98,7 +98,7 @@ instead. `--no-symlinks` is the default on Windows.
98
invoked diff tool returns a non-zero exit code.
99
+
100
'git-difftool' will forward the exit code of the invoked tool when
101
-'--trust-exit-code' is used.
101
+`--trust-exit-code` is used.
102
103
See linkgit:git-diff[1] for the full list of supported options.
104
Documentation/git-fetch-pack.txt
+1
-1
@@ -41,7 +41,7 @@ OPTIONS
41
option, then the refs from stdin are processed after those
42
on the command line.
43
+
44
-If '--stateless-rpc' is specified together with this option then
44
+If `--stateless-rpc` is specified together with this option then
45
the list of refs must be in packet format (pkt-line). Each ref must
46
be in a separate packet, and the list must end with a flush packet.
47
Documentation/git-filter-branch.txt
+2
-2
@@ -171,7 +171,7 @@ to other tags will be rewritten to point to the underlying commit.
171
untouched. This switch allow git-filter-branch to ignore such
172
commits. Though, this switch only applies for commits that have one
173
and only one parent, it will hence keep merges points. Also, this
174
- option is not compatible with the use of '--commit-filter'. Though you
174
+ option is not compatible with the use of `--commit-filter`. Though you
175
just need to use the function 'git_commit_non_empty_tree "$@"' instead
176
of the `git commit-tree "$@"` idiom in your commit filter to make that
177
happen.
@@ -197,7 +197,7 @@ to other tags will be rewritten to point to the underlying commit.
197
<rev-list options>...::
198
Arguments for 'git rev-list'. All positive refs included by
199
these options are rewritten. You may also specify options
200
- such as '--all', but you must use '--' to separate them from
200
+ such as `--all`, but you must use '--' to separate them from
201
the 'git filter-branch' options. Implies <<Remap_to_ancestor>>.
202
203
Documentation/git-for-each-ref.txt
+1
-1
@@ -142,7 +142,7 @@ align::
142
<width> and <position> used instead. For instance,
143
`%(align:<width>,<position>)`. If the contents length is more
144
than the width then no alignment is performed. If used with
145
- '--quote' everything in between %(align:...) and %(end) is
145
+ `--quote` everything in between %(align:...) and %(end) is
146
quoted, but if nested then only the topmost level performs
147
quoting.
148
Documentation/git-fsck.txt
+1
-1
@@ -95,7 +95,7 @@ DISCUSSION
95
git-fsck tests SHA-1 and general object sanity, and it does full tracking
96
of the resulting reachability and everything else. It prints out any
97
corruption it finds (missing or bad objects), and if you use the
98
-'--unreachable' flag it will also print out objects that exist but that
98
+`--unreachable` flag it will also print out objects that exist but that
99
aren't reachable from any of the specified head nodes (or the default
100
set, as mentioned above).
101
Documentation/git-grep.txt
+4
-4
@@ -45,12 +45,12 @@ grep.lineNumber::
45
46
grep.patternType::
47
Set the default matching behavior. Using a value of 'basic', 'extended',
48
- 'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
49
- '--fixed-strings', or '--perl-regexp' option accordingly, while the
48
+ 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
49
+ `--fixed-strings`, or `--perl-regexp` option accordingly, while the
50
value 'default' will return to the default matching behavior.
51
52
grep.extendedRegexp::
53
- If set to true, enable '--extended-regexp' option by default. This
53
+ If set to true, enable `--extended-regexp` option by default. This
54
option is ignored when the `grep.patternType` option is set to a value
55
other than 'default'.
56
@@ -59,7 +59,7 @@ grep.threads::
59
8 threads are used by default (for now).
60
61
grep.fullName::
62
- If set to true, enable '--full-name' option by default.
62
+ If set to true, enable `--full-name` option by default.
63
64
grep.fallbackToNoIndex::
65
If set to true, fall back to git grep --no-index if git grep
Documentation/git-help.txt
+3
-3
@@ -18,10 +18,10 @@ With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
18
command and a list of the most commonly used Git commands are printed
19
on the standard output.
20
21
-If the option '--all' or `-a` is given, all available commands are
21
+If the option `--all` or `-a` is given, all available commands are
22
printed on the standard output.
23
24
-If the option '--guide' or `-g` is given, a list of the useful
24
+If the option `--guide` or `-g` is given, a list of the useful
25
Git guides is also printed on the standard output.
26
27
If a command, or a guide, is given, a manual page for that command or
@@ -176,7 +176,7 @@ Note about git config --global
176
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
177
178
Note that all these configuration variables should probably be set
179
-using the '--global' flag, for example like this:
179
+using the `--global` flag, for example like this:
180
181
------------------------------------------------
182
$ git config --global help.format web
Documentation/git-http-push.txt
+2
-2
@@ -81,13 +81,13 @@ destination side.
81
exist in the set of remote refs; the ref matched <src>
82
locally is used as the name of the destination.
83
84
-Without '--force', the <src> ref is stored at the remote only if
84
+Without `--force`, the <src> ref is stored at the remote only if
85
<dst> does not exist, or <dst> is a proper subset (i.e. an
86
ancestor) of <src>. This check, known as "fast-forward check",
87
is performed in order to avoid accidentally overwriting the
88
remote ref and lose other peoples' commits from there.
89
90
-With '--force', the fast-forward check is disabled for all refs.
90
+With `--force`, the fast-forward check is disabled for all refs.
91
92
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
93
to disable the fast-forward check only on that ref.
Documentation/git-interpret-trailers.txt
+1
-1
@@ -219,7 +219,7 @@ Signed-off-by: Alice <alice@example.com>
219
Signed-off-by: Bob <bob@example.com>
220
------------
221
222
-* Use the '--in-place' option to edit a message file in place:
222
+* Use the `--in-place` option to edit a message file in place:
223
+
224
------------
225
$ cat msg.txt
Documentation/git-ls-files.txt
+1
-1
@@ -175,7 +175,7 @@ followed by the ("attr/<eolattr>").
175
176
Output
177
------
178
-'git ls-files' just outputs the filenames unless '--stage' is specified in
178
+'git ls-files' just outputs the filenames unless `--stage` is specified in
179
which case it outputs:
180
181
[<tag> ]<mode> <object> <stage> <file>
Documentation/git-p4.txt
+10
-10
@@ -104,7 +104,7 @@ $ git p4 sync //path/in/your/perforce/depot
104
------------
105
This imports the specified depot into
106
'refs/remotes/p4/master' in an existing Git repository. The
107
-'--branch' option can be used to specify a different branch to
107
+`--branch` option can be used to specify a different branch to
108
be used for the p4 content.
109
110
If a Git repository includes branches 'refs/remotes/origin/p4', these
@@ -114,7 +114,7 @@ from a Git remote, this can be useful in a multi-developer environment.
114
115
If there are multiple branches, doing 'git p4 sync' will automatically
116
use the "BRANCH DETECTION" algorithm to try to partition new changes
117
-into the right branch. This can be overridden with the '--branch'
117
+into the right branch. This can be overridden with the `--branch`
118
option to specify just a single branch to update.
119
120
@@ -150,10 +150,10 @@ $ git p4 submit topicbranch
150
------------
151
152
The upstream reference is generally 'refs/remotes/p4/master', but can
153
-be overridden using the '--origin=' command-line option.
153
+be overridden using the `--origin=` command-line option.
154
155
The p4 changes will be created as the user invoking 'git p4 submit'. The
156
-'--preserve-user' option will cause ownership to be modified
156
+`--preserve-user` option will cause ownership to be modified
157
according to the author of the Git commit. This option requires admin
158
privileges in p4, which can be granted using 'p4 protect'.
159
@@ -221,7 +221,7 @@ Git repository:
221
where they will be treated as remote-tracking branches by
222
linkgit:git-branch[1] and other commands. This option instead
223
puts p4 branches in 'refs/heads/p4/'. Note that future
224
- sync operations must specify '--import-local' as well so that
224
+ sync operations must specify `--import-local` as well so that
225
they can find the p4 branches in refs/heads.
226
227
--max-changes <n>::
@@ -245,7 +245,7 @@ Git repository:
245
default, involves removing the entire depot path. With this
246
option, the full p4 depot path is retained in Git. For example,
247
path '//depot/main/foo/bar.c', when imported from
248
- '//depot/main/', becomes 'foo/bar.c'. With '--keep-path', the
248
+ '//depot/main/', becomes 'foo/bar.c'. With `--keep-path`, the
249
Git path is instead 'depot/main/foo/bar.c'.
250
251
--use-client-spec::
@@ -341,7 +341,7 @@ p4 revision specifier on the end:
341
Import all changes from both named depot paths into a single
342
repository. Only files below these directories are included.
343
There is not a subdirectory in Git for each "proj1" and "proj2".
344
- You must use the '--destination' option when specifying more
344
+ You must use the `--destination` option when specifying more
345
than one depot path. The revision specifier must be specified
346
identically on each depot path. If there are files in the
347
depot paths with the same name, the path with the most recently
@@ -355,7 +355,7 @@ CLIENT SPEC
355
The p4 client specification is maintained with the 'p4 client' command
356
and contains among other fields, a View that specifies how the depot
357
is mapped into the client repository. The 'clone' and 'sync' commands
358
-can consult the client spec when given the '--use-client-spec' option or
358
+can consult the client spec when given the `--use-client-spec` option or
359
when the useClientSpec variable is true. After 'git p4 clone', the
360
useClientSpec variable is automatically set in the repository
361
configuration file. This allows future 'git p4 submit' commands to
@@ -390,7 +390,7 @@ different areas in the tree, and indicate related content. 'git p4'
390
can use these mappings to determine branch relationships.
391
392
If you have a repository where all the branches of interest exist as
393
-subdirectories of a single depot path, you can use '--detect-branches'
393
+subdirectories of a single depot path, you can use `--detect-branches`
394
when cloning or syncing to have 'git p4' automatically find
395
subdirectories in p4, and to generate these as branches in Git.
396
@@ -507,7 +507,7 @@ git-p4.labelImportRegexp::
507
git-p4.useClientSpec::
508
Specify that the p4 client spec should be used to identify p4
509
depot paths of interest. This is equivalent to specifying the
510
- option '--use-client-spec'. See the "CLIENT SPEC" section above.
510
+ option `--use-client-spec`. See the "CLIENT SPEC" section above.
511
This variable is a boolean, not the name of a p4 client.
512
513
git-p4.pathEncoding::
Documentation/git-push.txt
+1
-1
@@ -275,7 +275,7 @@ origin +master` to force a push to the `master` branch). See the
275
all submodules that changed in the revisions to be pushed will be
276
pushed. If on-demand was not able to push all necessary revisions
277
it will also be aborted and exit with non-zero status. A value of
278
- 'no' or using '--no-recurse-submodules' can be used to override the
278
+ 'no' or using `--no-recurse-submodules` can be used to override the
279
push.recurseSubmodules configuration variable when no submodule
280
recursion is required.
281
Documentation/git-rebase.txt
+5
-5
@@ -208,10 +208,10 @@ rebase.stat::
208
rebase. False by default.
209
210
rebase.autoSquash::
211
- If set to true enable '--autosquash' option by default.
211
+ If set to true enable `--autosquash` option by default.
212
213
rebase.autoStash::
214
- If set to true enable '--autostash' option by default.
214
+ If set to true enable `--autostash` option by default.
215
216
rebase.missingCommitsCheck::
217
If set to "warn", print warnings about removed commits in
@@ -220,7 +220,7 @@ rebase.missingCommitsCheck::
220
done. "ignore" by default.
221
222
rebase.instructionFormat::
223
- Custom commit list format to use during an '--interactive' rebase.
223
+ Custom commit list format to use during an `--interactive` rebase.
224
225
OPTIONS
226
-------
@@ -428,9 +428,9 @@ squash/fixup series.
428
"fixup! " or "squash! " after the first, in case you referred to an
429
earlier fixup/squash with `git commit --fixup/--squash`.
430
+
431
-This option is only valid when the '--interactive' option is used.
431
+This option is only valid when the `--interactive` option is used.
432
+
433
-If the '--autosquash' option is enabled by default using the
433
+If the `--autosquash` option is enabled by default using the
434
configuration variable `rebase.autoSquash`, this option can be
435
used to override and disable this setting.
436
Documentation/git-remote.txt
+5
-5
@@ -137,9 +137,9 @@ branches, adds to that list.
137
Retrieves the URLs for a remote. Configurations for `insteadOf` and
138
`pushInsteadOf` are expanded here. By default, only the first URL is listed.
139
+
140
-With '--push', push URLs are queried rather than fetch URLs.
140
+With `--push`, push URLs are queried rather than fetch URLs.
141
+
142
-With '--all', all URLs for the remote will be listed.
142
+With `--all`, all URLs for the remote will be listed.
143
144
'set-url'::
145
@@ -147,11 +147,11 @@ Changes URLs for the remote. Sets first URL for remote <name> that matches
147
regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If
148
<oldurl> doesn't match any URL, an error occurs and nothing is changed.
149
+
150
-With '--push', push URLs are manipulated instead of fetch URLs.
150
+With `--push`, push URLs are manipulated instead of fetch URLs.
151
+
152
-With '--add', instead of changing existing URLs, new URL is added.
152
+With `--add`, instead of changing existing URLs, new URL is added.
153
+
154
-With '--delete', instead of changing existing URLs, all URLs matching
154
+With `--delete`, instead of changing existing URLs, all URLs matching
155
regex <url> are deleted for remote <name>. Trying to delete all
156
non-push URLs is an error.
157
+
Documentation/git-revert.txt
+2
-2
@@ -24,7 +24,7 @@ from the HEAD commit).
24
Note: 'git revert' is used to record some new commits to reverse the
25
effect of some earlier commits (often only a faulty one). If you want to
26
throw away all uncommitted changes in your working directory, you
27
-should see linkgit:git-reset[1], particularly the '--hard' option. If
27
+should see linkgit:git-reset[1], particularly the `--hard` option. If
28
you want to extract specific files as they were in another commit, you
29
should see linkgit:git-checkout[1], specifically the `git checkout
30
<commit> -- <filename>` syntax. Take care with these alternatives as
@@ -37,7 +37,7 @@ OPTIONS
37
For a more complete list of ways to spell commit names, see
38
linkgit:gitrevisions[7].
39
Sets of commits can also be given but no traversal is done by
40
- default, see linkgit:git-rev-list[1] and its '--no-walk'
40
+ default, see linkgit:git-rev-list[1] and its `--no-walk`
41
option.
42
43
-e::
Documentation/git-send-email.txt
+12
-12
@@ -66,7 +66,7 @@ This option may be specified multiple times.
66
Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])
67
to edit an introductory message for the patch series.
68
+
69
-When '--compose' is used, git send-email will use the From, Subject, and
69
+When `--compose` is used, git send-email will use the From, Subject, and
70
In-Reply-To headers specified in the message. If the body of the message
71
(what you type after the headers and a blank line) only contains blank
72
(or Git: prefixed) lines, the summary won't be sent, but From, Subject,
@@ -182,19 +182,19 @@ $ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ...
182
+
183
If at least one of the specified mechanisms matches the ones advertised by the
184
SMTP server and if it is supported by the utilized SASL library, the mechanism
185
-is used for authentication. If neither 'sendemail.smtpAuth' nor '--smtp-auth'
185
+is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth`
186
is specified, all mechanisms supported by the SASL library can be used.
187
188
--smtp-pass[=<password>]::
189
Password for SMTP-AUTH. The argument is optional: If no
190
argument is specified, then the empty string is used as
191
the password. Default is the value of `sendemail.smtpPass`,
192
- however '--smtp-pass' always overrides this value.
192
+ however `--smtp-pass` always overrides this value.
193
+
194
Furthermore, passwords need not be specified in configuration files
195
or on the command line. If a username has been specified (with
196
-'--smtp-user' or a `sendemail.smtpUser`), but no password has been
197
-specified (with '--smtp-pass' or `sendemail.smtpPass`), then
196
+`--smtp-user` or a `sendemail.smtpUser`), but no password has been
197
+specified (with `--smtp-pass` or `sendemail.smtpPass`), then
198
a password is obtained using 'git-credential'.
199
200
--smtp-server=<host>::
@@ -240,7 +240,7 @@ must be used for each option.
240
241
--smtp-user=<user>::
242
Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`;
243
- if a username is not specified (with '--smtp-user' or `sendemail.smtpUser`),
243
+ if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`),
244
then authentication is not attempted.
245
246
--smtp-debug=0|1::
@@ -364,8 +364,8 @@ have been specified, in which case default to 'compose'.
364
365
--[no-]format-patch::
366
When an argument may be understood either as a reference or as a file name,
367
- choose to understand it as a format-patch argument ('--format-patch')
368
- or as a file name ('--no-format-patch'). By default, when such a conflict
367
+ choose to understand it as a format-patch argument (`--format-patch`)
368
+ or as a file name (`--no-format-patch`). By default, when such a conflict
369
occurs, git send-email will fail.
370
371
--quiet::
@@ -382,7 +382,7 @@ have been specified, in which case default to 'compose'.
382
--
383
+
384
Default is the value of `sendemail.validate`; if this is not set,
385
-default to '--validate'.
385
+default to `--validate`.
386
387
--force::
388
Send emails even if safety checks would prevent it.
@@ -428,13 +428,13 @@ sendmail;;
428
429
sendemail.multiEdit::
430
If true (default), a single editor instance will be spawned to edit
431
- files you have to edit (patches when '--annotate' is used, and the
432
- summary when '--compose' is used). If false, files will be edited one
431
+ files you have to edit (patches when `--annotate` is used, and the
432
+ summary when `--compose` is used). If false, files will be edited one
433
after the other, spawning a new editor each time.
434
435
sendemail.confirm::
436
Sets the default for whether to confirm before sending. Must be
437
- one of 'always', 'never', 'cc', 'compose', or 'auto'. See '--confirm'
437
+ one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm`
438
in the previous section for the meaning of these values.
439
440
EXAMPLE
Documentation/git-send-pack.txt
+5
-5
@@ -44,7 +44,7 @@ OPTIONS
44
option, then the refs from stdin are processed after those
45
on the command line.
46
+
47
-If '--stateless-rpc' is specified together with this option then
47
+If `--stateless-rpc` is specified together with this option then
48
the list of refs must be in packet format (pkt-line). Each ref must
49
be in a separate packet, and the list must end with a flush packet.
50
@@ -99,11 +99,11 @@ Specifying the Refs
99
There are three ways to specify which refs to update on the
100
remote end.
101
102
-With '--all' flag, all refs that exist locally are transferred to
102
+With `--all` flag, all refs that exist locally are transferred to
103
the remote side. You cannot specify any '<ref>' if you use
104
this flag.
105
106
-Without '--all' and without any '<ref>', the heads that exist
106
+Without `--all` and without any '<ref>', the heads that exist
107
both on the local side and on the remote side are updated.
108
109
When one or more '<ref>' are specified explicitly (whether on the
@@ -134,13 +134,13 @@ name. See linkgit:git-rev-parse[1].
134
exist in the set of remote refs; the ref matched <src>
135
locally is used as the name of the destination.
136
137
-Without '--force', the <src> ref is stored at the remote only if
137
+Without `--force`, the <src> ref is stored at the remote only if
138
<dst> does not exist, or <dst> is a proper subset (i.e. an
139
ancestor) of <src>. This check, known as "fast-forward check",
140
is performed in order to avoid accidentally overwriting the
141
remote ref and lose other peoples' commits from there.
142
143
-With '--force', the fast-forward check is disabled for all refs.
143
+With `--force`, the fast-forward check is disabled for all refs.
144
145
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
146
to disable the fast-forward check only on that ref.
Documentation/git-show-branch.txt
+1
-1
@@ -60,7 +60,7 @@ OPTIONS
60
are shown before their parents).
61
62
--date-order::
63
- This option is similar to '--topo-order' in the sense that no
63
+ This option is similar to `--topo-order` in the sense that no
64
parent comes before all of its children, but otherwise commits
65
are ordered according to their commit date.
66
Documentation/git-show-ref.txt
+3
-3
@@ -60,7 +60,7 @@ OPTIONS
60
61
Enable stricter reference checking by requiring an exact ref path.
62
Aside from returning an error code of 1, it will also print an error
63
- message if '--quiet' was not specified.
63
+ message if `--quiet` was not specified.
64
65
--abbrev[=<n>]::
66
@@ -70,7 +70,7 @@ OPTIONS
70
-q::
71
--quiet::
72
73
- Do not print any results to stdout. When combined with '--verify' this
73
+ Do not print any results to stdout. When combined with `--verify` this
74
can be used to silently check if a reference exists.
75
76
--exclude-existing[=<pattern>]::
@@ -134,7 +134,7 @@ use:
134
This will show "refs/heads/master" but also "refs/remote/other-repo/master",
135
if such references exists.
136
137
-When using the '--verify' flag, the command requires an exact path:
137
+When using the `--verify` flag, the command requires an exact path:
138
139
-----------------------------------------------------------------------------
140
git show-ref --verify refs/heads/master
Documentation/git-svn.txt
+13
-13
@@ -98,11 +98,11 @@ your Perl's Getopt::Long is < v2.37).
98
--ignore-paths=<regex>;;
99
When passed to 'init' or 'clone' this regular expression will
100
be preserved as a config key. See 'fetch' for a description
101
- of '--ignore-paths'.
101
+ of `--ignore-paths`.
102
--include-paths=<regex>;;
103
When passed to 'init' or 'clone' this regular expression will
104
be preserved as a config key. See 'fetch' for a description
105
- of '--include-paths'.
105
+ of `--include-paths`.
106
--no-minimize-url;;
107
When tracking multiple directories (using --stdlayout,
108
--branches, or --tags options), git svn will attempt to connect
@@ -110,7 +110,7 @@ your Perl's Getopt::Long is < v2.37).
110
repository. This default allows better tracking of history if
111
entire projects are moved within a repository, but may cause
112
issues on repositories where read access restrictions are in
113
- place. Passing '--no-minimize-url' will allow git svn to
113
+ place. Passing `--no-minimize-url` will allow git svn to
114
accept URLs as-is without attempting to connect to a higher
115
level directory. This option is off by default when only
116
one URL/branch is tracked (it would do little good).
@@ -141,7 +141,7 @@ the same local time zone.
141
--ignore-paths=<regex>;;
142
This allows one to specify a Perl regular expression that will
143
cause skipping of all matching paths from checkout from SVN.
144
- The '--ignore-paths' option should match for every 'fetch'
144
+ The `--ignore-paths` option should match for every 'fetch'
145
(including automatic fetches due to 'clone', 'dcommit',
146
'rebase', etc) on a given repository.
147
+
@@ -170,10 +170,10 @@ Skip "branches" and "tags" of first level directories;;
170
--include-paths=<regex>;;
171
This allows one to specify a Perl regular expression that will
172
cause the inclusion of only matching paths from checkout from SVN.
173
- The '--include-paths' option should match for every 'fetch'
173
+ The `--include-paths` option should match for every 'fetch'
174
(including automatic fetches due to 'clone', 'dcommit',
175
- 'rebase', etc) on a given repository. '--ignore-paths' takes
176
- precedence over '--include-paths'.
175
+ 'rebase', etc) on a given repository. `--ignore-paths` takes
176
+ precedence over `--include-paths`.
177
+
178
[verse]
179
config key: svn-remote.<name>.include-paths
@@ -191,7 +191,7 @@ config key: svn-remote.<name>.include-paths
191
or if a second argument is passed; it will create a directory
192
and work within that. It accepts all arguments that the
193
'init' and 'fetch' commands accept; with the exception of
194
- '--fetch-all' and '--parent'. After a repository is cloned,
194
+ `--fetch-all` and `--parent`. After a repository is cloned,
195
the 'fetch' command will be able to update revisions without
196
affecting the working tree; and the 'rebase' command will be
197
able to update the working tree with the latest changes.
@@ -216,7 +216,7 @@ it preserves linear history with 'git rebase' instead of
216
'git merge' for ease of dcommitting with 'git svn'.
217
+
218
This accepts all options that 'git svn fetch' and 'git rebase'
219
-accept. However, '--fetch-all' only fetches from the current
219
+accept. However, `--fetch-all` only fetches from the current
220
[svn-remote], and not all [svn-remote] definitions.
221
+
222
Like 'git rebase'; this requires that the working tree be clean
@@ -905,7 +905,7 @@ parent of the branch. However, it is possible that there is no suitable
905
Git commit to serve as parent. This will happen, among other reasons,
906
if the SVN branch is a copy of a revision that was not fetched by 'git
907
svn' (e.g. because it is an old revision that was skipped with
908
-'--revision'), or if in SVN a directory was copied that is not tracked
908
+`--revision`), or if in SVN a directory was copied that is not tracked
909
by 'git svn' (such as a branch that is not tracked at all, or a
910
subdirectory of a tracked branch). In these cases, 'git svn' will still
911
create a Git branch, but instead of using an existing Git commit as the
@@ -982,12 +982,12 @@ directories in the working copy. While this is the easiest way to get a
982
copy of a complete repository, for projects with many branches it will
983
lead to a working copy many times larger than just the trunk. Thus for
984
projects using the standard directory structure (trunk/branches/tags),
985
-it is recommended to clone with option '--stdlayout'. If the project
985
+it is recommended to clone with option `--stdlayout`. If the project
986
uses a non-standard structure, and/or if branches and tags are not
987
required, it is easiest to only clone one directory (typically trunk),
988
without giving any repository layout options. If the full history with
989
-branches and tags is required, the options '--trunk' / '--branches' /
990
-'--tags' must be used.
989
+branches and tags is required, the options `--trunk` / `--branches` /
990
+`--tags` must be used.
991
992
When using multiple --branches or --tags, 'git svn' does not automatically
993
handle name collisions (for example, if two branches from different paths have
Documentation/git-tag.txt
+1
-1
@@ -167,7 +167,7 @@ This option is only applicable when listing tags without annotation lines.
167
168
--[no-]merged [<commit>]::
169
Only list tags whose tips are reachable, or not reachable
170
- if '--no-merged' is used, from the specified commit ('HEAD'
170
+ if `--no-merged` is used, from the specified commit ('HEAD'
171
if not specified).
172
173
CONFIGURATION
Documentation/git-update-index.txt
+7
-7
@@ -102,7 +102,7 @@ thus, in case the assumed-untracked file is changed upstream,
102
you will need to handle the situation manually.
103
104
--really-refresh::
105
- Like '--refresh', but checks stat information unconditionally,
105
+ Like `--refresh`, but checks stat information unconditionally,
106
without regard to the "assume unchanged" setting.
107
108
--[no-]skip-worktree::
@@ -211,7 +211,7 @@ will remove the intended effect of the option.
211
212
Using --refresh
213
---------------
214
-'--refresh' does not calculate a new sha1 file or bring the index
214
+`--refresh` does not calculate a new sha1 file or bring the index
215
up-to-date for mode/content changes. But what it *does* do is to
216
"re-match" the stat information of a file with the index, so that you
217
can refresh the index for a file that hasn't been changed but where
@@ -222,7 +222,7 @@ up the stat index details with the proper files.
222
223
Using --cacheinfo or --info-only
224
--------------------------------
225
-'--cacheinfo' is used to register a file that is not in the
225
+`--cacheinfo` is used to register a file that is not in the
226
current working directory. This is useful for minimum-checkout
227
merging.
228
@@ -232,12 +232,12 @@ To pretend you have a file with mode and sha1 at path, say:
232
$ git update-index --cacheinfo <mode>,<sha1>,<path>
233
----------------
234
235
-'--info-only' is used to register files without placing them in the object
235
+`--info-only` is used to register files without placing them in the object
236
database. This is useful for status-only repositories.
237
238
-Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
239
-but the object database isn't. '--cacheinfo' is useful when the object is
240
-in the database but the file isn't available locally. '--info-only' is
238
+Both `--cacheinfo` and `--info-only` behave similarly: the index is updated
239
+but the object database isn't. `--cacheinfo` is useful when the object is
240
+in the database but the file isn't available locally. `--info-only` is
241
useful when the file is available, but you do not wish to update the
242
object database.
243
Documentation/git-web--browse.txt
+1
-1
@@ -110,7 +110,7 @@ Note about git-config --global
110
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
111
112
Note that these configuration variables should probably be set using
113
-the '--global' flag, for example like this:
113
+the `--global` flag, for example like this:
114
115
------------------------------------------------
116
$ git config --global web.browser firefox
Documentation/git.txt
+4
-4
@@ -508,7 +508,7 @@ OPTIONS
508
509
--help::
510
Prints the synopsis and a list of the most commonly used
511
- commands. If the option '--all' or `-a` is given then all
511
+ commands. If the option `--all` or `-a` is given then all
512
available commands are printed. If a Git command is named this
513
option will bring up the manual page for that command.
514
+
@@ -850,16 +850,16 @@ Git so take care if using a foreign front-end.
850
If the `GIT_DIR` environment variable is set then it
851
specifies a path to use instead of the default `.git`
852
for the base of the repository.
853
- The '--git-dir' command-line option also sets this value.
853
+ The `--git-dir` command-line option also sets this value.
854
855
`GIT_WORK_TREE`::
856
Set the path to the root of the working tree.
857
- This can also be controlled by the '--work-tree' command-line
857
+ This can also be controlled by the `--work-tree` command-line
858
option and the core.worktree configuration variable.
859
860
`GIT_NAMESPACE`::
861
Set the Git namespace; see linkgit:gitnamespaces[7] for details.
862
- The '--namespace' command-line option also sets this value.
862
+ The `--namespace` command-line option also sets this value.
863
864
`GIT_CEILING_DIRECTORIES`::
865
This should be a colon-separated list of absolute paths. If
Documentation/gitcore-tutorial.txt
+1
-1
@@ -949,7 +949,7 @@ for details.
949
[NOTE]
950
If there were more commits on the 'master' branch after the merge, the
951
merge commit itself would not be shown by 'git show-branch' by
952
-default. You would need to provide '--sparse' option to make the
952
+default. You would need to provide `--sparse` option to make the
953
merge commit visible in this case.
954
955
Now, let's pretend you are the one who did all the work in
Documentation/gitdiffcore.txt
+2
-2
@@ -28,8 +28,8 @@ The 'git diff-{asterisk}' family works by first comparing two sets of
28
files:
29
30
- 'git diff-index' compares contents of a "tree" object and the
31
- working directory (when '--cached' flag is not used) or a
32
- "tree" object and the index file (when '--cached' flag is
31
+ working directory (when `--cached` flag is not used) or a
32
+ "tree" object and the index file (when `--cached` flag is
33
used);
34
35
- 'git diff-files' compares contents of the index file and the
Documentation/gitk.txt
+1
-1
@@ -82,7 +82,7 @@ linkgit:git-rev-list[1] for a complete list.
82
83
--simplify-merges::
84
85
- Additional option to '--full-history' to remove some needless
85
+ Additional option to `--full-history` to remove some needless
86
merges from the resulting history, as there are no selected
87
commits contributing to this merge. (See "History
88
simplification" in linkgit:git-log[1] for a more detailed
Documentation/gitmodules.txt
+1
-1
@@ -19,7 +19,7 @@ of linkgit:git-config[1].
19
20
The file contains one subsection per submodule, and the subsection value
21
is the name of the submodule. The name is set to the path where the
22
-submodule has been added unless it was customized with the '--name'
22
+submodule has been added unless it was customized with the `--name`
23
option of 'git submodule add'. Each submodule section also contains the
24
following required keys:
25
Documentation/gitremote-helpers.txt
+4
-4
@@ -210,17 +210,17 @@ the remote repository.
210
'export-marks' <file>::
211
This modifies the 'export' capability, instructing Git to dump the
212
internal marks table to <file> when complete. For details,
213
- read up on '--export-marks=<file>' in linkgit:git-fast-export[1].
213
+ read up on `--export-marks=<file>` in linkgit:git-fast-export[1].
214
215
'import-marks' <file>::
216
This modifies the 'export' capability, instructing Git to load the
217
marks specified in <file> before processing any input. For details,
218
- read up on '--import-marks=<file>' in linkgit:git-fast-export[1].
218
+ read up on `--import-marks=<file>` in linkgit:git-fast-export[1].
219
220
'signed-tags'::
221
This modifies the 'export' capability, instructing Git to pass
222
- '--signed-tags=verbatim' to linkgit:git-fast-export[1]. In the
223
- absence of this capability, Git will use '--signed-tags=warn-strip'.
222
+ `--signed-tags=verbatim` to linkgit:git-fast-export[1]. In the
223
+ absence of this capability, Git will use `--signed-tags=warn-strip`.
224
225
226
Documentation/revisions.txt
+1
-1
@@ -71,7 +71,7 @@ some output processing may assume ref names in UTF-8.
71
existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state
72
of your *local* ref at a given time; e.g., what was in your local
73
'master' branch last week. If you want to look at commits made during
74
- certain times, see '--since' and '--until'.
74
+ certain times, see `--since` and `--until`.
75
76
'<refname>@{<n>}', e.g. 'master@\{1\}'::
77
A ref followed by the suffix '@' with an ordinal specification