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>
Björn Gustavsson committed
Nov 22, 2009 at 20:43 UTC
f9821e2b2139e5e2fbe9fde3df58ddc98ae4ce19
1 file changed
+8
-8
Documentation/git-apply.txt
+8
-8
@@ -37,7 +37,7 @@ OPTIONS
37
input. Turns off "apply".
38
39
--numstat::
40
- Similar to \--stat, but shows the number of added and
40
+ Similar to `--stat`, but shows the number of added and
41
deleted lines in decimal notation and the pathname without
42
abbreviation, to make it more machine friendly. For
43
binary files, outputs two `-` instead of saying
@@ -55,7 +55,7 @@ OPTIONS
55
file and detects errors. Turns off "apply".
56
57
--index::
58
- When --check is in effect, or when applying the patch
58
+ When `--check` is in effect, or when applying the patch
59
(which is the default when none of the options that
60
disables it is in effect), make sure the patch is
61
applicable to what the current index file records. If
@@ -66,7 +66,7 @@ OPTIONS
66
--cached::
67
Apply a patch without touching the working tree. Instead take the
68
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`.
70
71
--build-fake-ancestor=<file>::
72
Newer 'git-diff' output has embedded 'index information'
@@ -112,8 +112,8 @@ any of those replacements occurred.
112
By default, 'git-apply' expects that the patch being
113
applied is a unified diff with at least one line of context.
114
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`.
117
+
118
Note, for the reasons stated above usage of context-free patches is
119
discouraged.
@@ -149,7 +149,7 @@ discouraged.
149
be useful when importing patchsets, where you want to include certain
150
files or directories.
151
+
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
153
order they appear on the command line, and the first match determines if a
154
patch to each path is used. A patch to a path that does not match any
155
include/exclude pattern is used by default if there is no include pattern
@@ -232,13 +232,13 @@ Submodules
232
If the patch contains any changes to submodules then 'git-apply'
233
treats these changes as follows.
234
235
-If --index is specified (explicitly or implicitly), then the submodule
235
+If `--index` is specified (explicitly or implicitly), then the submodule
236
commits must match the index exactly for the patch to apply. If any
237
of the submodules are checked-out, then these check-outs are completely
238
ignored, i.e., they are not required to be up-to-date or clean and they
239
are not updated.
240
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
242
are ignored and only the absence or presence of the corresponding
243
subdirectory is checked and (if possible) updated.
244