Skip to content

Commit f9821e2

Browse files
bjornggitster
authored andcommitted
apply: Format all options using back-quotes
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 38a3964 commit f9821e2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/git-apply.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ OPTIONS
3737
input. Turns off "apply".
3838

3939
--numstat::
40-
Similar to \--stat, but shows the number of added and
40+
Similar to `--stat`, but shows the number of added and
4141
deleted lines in decimal notation and the pathname without
4242
abbreviation, to make it more machine friendly. For
4343
binary files, outputs two `-` instead of saying
@@ -55,7 +55,7 @@ OPTIONS
5555
file and detects errors. Turns off "apply".
5656

5757
--index::
58-
When --check is in effect, or when applying the patch
58+
When `--check` is in effect, or when applying the patch
5959
(which is the default when none of the options that
6060
disables it is in effect), make sure the patch is
6161
applicable to what the current index file records. If
@@ -66,7 +66,7 @@ OPTIONS
6666
--cached::
6767
Apply a patch without touching the working tree. Instead take the
6868
cached data, apply the patch, and store the result in the index
69-
without using the working tree. This implies '--index'.
69+
without using the working tree. This implies `--index`.
7070

7171
--build-fake-ancestor=<file>::
7272
Newer 'git-diff' output has embedded 'index information'
@@ -112,8 +112,8 @@ any of those replacements occurred.
112112
By default, 'git-apply' expects that the patch being
113113
applied is a unified diff with at least one line of context.
114114
This provides good safety measures, but breaks down when
115-
applying a diff generated with --unified=0. To bypass these
116-
checks use '--unidiff-zero'.
115+
applying a diff generated with `--unified=0`. To bypass these
116+
checks use `--unidiff-zero`.
117117
+
118118
Note, for the reasons stated above usage of context-free patches is
119119
discouraged.
@@ -149,7 +149,7 @@ discouraged.
149149
be useful when importing patchsets, where you want to include certain
150150
files or directories.
151151
+
152-
When --exclude and --include patterns are used, they are examined in the
152+
When `--exclude` and `--include` patterns are used, they are examined in the
153153
order they appear on the command line, and the first match determines if a
154154
patch to each path is used. A patch to a path that does not match any
155155
include/exclude pattern is used by default if there is no include pattern
@@ -232,13 +232,13 @@ Submodules
232232
If the patch contains any changes to submodules then 'git-apply'
233233
treats these changes as follows.
234234

235-
If --index is specified (explicitly or implicitly), then the submodule
235+
If `--index` is specified (explicitly or implicitly), then the submodule
236236
commits must match the index exactly for the patch to apply. If any
237237
of the submodules are checked-out, then these check-outs are completely
238238
ignored, i.e., they are not required to be up-to-date or clean and they
239239
are not updated.
240240

241-
If --index is not specified, then the submodule commits in the patch
241+
If `--index` is not specified, then the submodule commits in the patch
242242
are ignored and only the absence or presence of the corresponding
243243
subdirectory is checked and (if possible) updated.
244244

0 commit comments

Comments
 (0)