]>
Commit | Line | Data |
---|---|---|
d0587fd5 JH |
1 | git-apply(1) |
2 | ============ | |
d0587fd5 JH |
3 | |
4 | NAME | |
5 | ---- | |
38a39647 | 6 | git-apply - Apply a patch to files and/or to the index |
d0587fd5 JH |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
353ce815 | 11 | [verse] |
cff5dc09 | 12 | 'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way] |
f26c4940 | 13 | [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] |
0b9a9dd0 | 14 | [--allow-binary-replacement | --binary] [--reject] [-z] |
62b4698e | 15 | [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] |
d725fbde | 16 | [--ignore-space-change | --ignore-whitespace] |
0adda936 | 17 | [--whitespace=(nowarn|warn|fix|error|error-all)] |
62b4698e | 18 | [--exclude=<path>] [--include=<path>] [--directory=<root>] |
c536c075 | 19 | [--verbose] [--unsafe-paths] [<patch>...] |
d0587fd5 JH |
20 | |
21 | DESCRIPTION | |
22 | ----------- | |
38a39647 | 23 | Reads the supplied diff output (i.e. "a patch") and applies it to files. |
16a86d43 NTND |
24 | When running from a subdirectory in a repository, patched paths |
25 | outside the directory are ignored. | |
38a39647 | 26 | With the `--index` option the patch is also applied to the index, and |
964498e7 | 27 | with the `--cached` option the patch is only applied to the index. |
38a39647 | 28 | Without these options, the command applies the patch only to files, |
2de9b711 | 29 | and does not require them to be in a Git repository. |
d0587fd5 | 30 | |
08b29826 BK |
31 | This command applies the patch but does not create a commit. Use |
32 | linkgit:git-am[1] to create commits from patches generated by | |
33 | linkgit:git-format-patch[1] and/or received by email. | |
34 | ||
d0587fd5 JH |
35 | OPTIONS |
36 | ------- | |
12dd6e8c | 37 | <patch>...:: |
1d035f85 | 38 | The files to read the patch from. '-' can be used to read |
12dd6e8c | 39 | from the standard input. |
d0587fd5 | 40 | |
d0587fd5 JH |
41 | --stat:: |
42 | Instead of applying the patch, output diffstat for the | |
12dd6e8c | 43 | input. Turns off "apply". |
d0587fd5 | 44 | |
7d8b7c21 | 45 | --numstat:: |
f9821e2b | 46 | Similar to `--stat`, but shows the number of added and |
1d035f85 | 47 | deleted lines in decimal notation and the pathname without |
2f89543e JH |
48 | abbreviation, to make it more machine friendly. For |
49 | binary files, outputs two `-` instead of saying | |
50 | `0 0`. Turns off "apply". | |
7d8b7c21 | 51 | |
d0587fd5 JH |
52 | --summary:: |
53 | Instead of applying the patch, output a condensed | |
54 | summary of information obtained from git diff extended | |
55 | headers, such as creations, renames and mode changes. | |
12dd6e8c | 56 | Turns off "apply". |
d0587fd5 JH |
57 | |
58 | --check:: | |
59 | Instead of applying the patch, see if the patch is | |
c34ec655 | 60 | applicable to the current working tree and/or the index |
12dd6e8c | 61 | file and detects errors. Turns off "apply". |
d0587fd5 JH |
62 | |
63 | --index:: | |
f9821e2b | 64 | When `--check` is in effect, or when applying the patch |
d0587fd5 JH |
65 | (which is the default when none of the options that |
66 | disables it is in effect), make sure the patch is | |
67 | applicable to what the current index file records. If | |
c34ec655 | 68 | the file to be patched in the working tree is not |
7560f547 | 69 | up to date, it is flagged as an error. This flag also |
d0587fd5 JH |
70 | causes the index file to be updated. |
71 | ||
5684ed6d | 72 | --cached:: |
1d035f85 DM |
73 | Apply a patch without touching the working tree. Instead take the |
74 | cached data, apply the patch, and store the result in the index | |
f9821e2b | 75 | without using the working tree. This implies `--index`. |
5684ed6d | 76 | |
cff5dc09 NTND |
77 | --intent-to-add:: |
78 | When applying the patch only to the working tree, mark new | |
79 | files to be added to the index later (see `--intent-to-add` | |
80 | option in linkgit:git-add[1]). This option is ignored unless | |
81 | running in a Git repository and `--index` is not specified. | |
82 | Note that `--index` could be implied by other options such | |
83 | as `--cached` or `--3way`. | |
84 | ||
78fb67f3 JH |
85 | -3:: |
86 | --3way:: | |
87 | When the patch does not apply cleanly, fall back on 3-way merge if | |
88 | the patch records the identity of blobs it is supposed to apply to, | |
89 | and we have those blobs available locally, possibly leaving the | |
90 | conflict markers in the files in the working tree for the user to | |
91 | resolve. This option implies the `--index` option, and is incompatible | |
92 | with the `--reject` and the `--cached` options. | |
93 | ||
f26c4940 | 94 | --build-fake-ancestor=<file>:: |
0b444cdb | 95 | Newer 'git diff' output has embedded 'index information' |
d88156e9 JH |
96 | for each blob to help identify the original version that |
97 | the patch applies to. When this flag is given, and if | |
1d035f85 | 98 | the original versions of the blobs are available locally, |
7a988699 JS |
99 | builds a temporary index containing those blobs. |
100 | + | |
101 | When a pure mode change is encountered (which has no index information), | |
102 | the information is read from the current index instead. | |
d88156e9 | 103 | |
3240240f SB |
104 | -R:: |
105 | --reverse:: | |
5684ed6d JF |
106 | Apply the patch in reverse. |
107 | ||
108 | --reject:: | |
0b444cdb | 109 | For atomicity, 'git apply' by default fails the whole patch and |
5684ed6d JF |
110 | does not touch the working tree when some of the hunks |
111 | do not apply. This option makes it apply | |
b32d37a3 | 112 | the parts of the patch that are applicable, and leave the |
8938045a | 113 | rejected hunks in corresponding *.rej files. |
5684ed6d | 114 | |
d88156e9 | 115 | -z:: |
64485b4a BG |
116 | When `--numstat` has been given, do not munge pathnames, |
117 | but use a NUL-terminated machine-readable format. | |
118 | + | |
860cd699 AH |
119 | Without this option, pathnames with "unusual" characters are quoted as |
120 | explained for the configuration variable `core.quotePath` (see | |
121 | linkgit:git-config[1]). | |
d88156e9 | 122 | |
e36f8b60 | 123 | -p<n>:: |
ee930754 JK |
124 | Remove <n> leading path components (separated by slashes) from |
125 | traditional diff paths. E.g., with `-p2`, a patch against | |
126 | `a/dir/file` will be applied directly to `file`. The default is | |
127 | 1. | |
e36f8b60 | 128 | |
47495887 EB |
129 | -C<n>:: |
130 | Ensure at least <n> lines of surrounding context match before | |
131 | and after each change. When fewer lines of surrounding | |
74237d62 | 132 | context exist they all must match. By default no context is |
47495887 EB |
133 | ever ignored. |
134 | ||
f58bb6fb | 135 | --unidiff-zero:: |
0b444cdb | 136 | By default, 'git apply' expects that the patch being |
f58bb6fb JF |
137 | applied is a unified diff with at least one line of context. |
138 | This provides good safety measures, but breaks down when | |
f9821e2b BG |
139 | applying a diff generated with `--unified=0`. To bypass these |
140 | checks use `--unidiff-zero`. | |
f58bb6fb | 141 | + |
1d035f85 | 142 | Note, for the reasons stated above usage of context-free patches is |
f58bb6fb JF |
143 | discouraged. |
144 | ||
12dd6e8c | 145 | --apply:: |
5684ed6d | 146 | If you use any of the options marked "Turns off |
0b444cdb | 147 | 'apply'" above, 'git apply' reads and outputs the |
1d035f85 | 148 | requested information without actually applying the |
12dd6e8c JH |
149 | patch. Give this flag after those flags to also apply |
150 | the patch. | |
151 | ||
e433705d JH |
152 | --no-add:: |
153 | When applying a patch, ignore additions made by the | |
71a9883d | 154 | patch. This can be used to extract the common part between |
2fd02c92 | 155 | two files by first running 'diff' on them and applying |
e433705d | 156 | the result with this option, which would apply the |
1d035f85 | 157 | deletion part but not the addition part. |
d0587fd5 | 158 | |
3240240f SB |
159 | --allow-binary-replacement:: |
160 | --binary:: | |
2b6eef94 JH |
161 | Historically we did not allow binary patch applied |
162 | without an explicit permission from the user, and this | |
163 | flag was the way to do so. Currently we always allow binary | |
164 | patch application, so this is a no-op. | |
27dedf0c | 165 | |
5684ed6d JF |
166 | --exclude=<path-pattern>:: |
167 | Don't apply changes to files matching the given path pattern. This can | |
168 | be useful when importing patchsets, where you want to exclude certain | |
169 | files or directories. | |
170 | ||
6ecb1ee2 JH |
171 | --include=<path-pattern>:: |
172 | Apply changes to files matching the given path pattern. This can | |
173 | be useful when importing patchsets, where you want to include certain | |
174 | files or directories. | |
175 | + | |
f9821e2b | 176 | When `--exclude` and `--include` patterns are used, they are examined in the |
6ecb1ee2 JH |
177 | order they appear on the command line, and the first match determines if a |
178 | patch to each path is used. A patch to a path that does not match any | |
179 | include/exclude pattern is used by default if there is no include pattern | |
180 | on the command line, and ignored if there is any include pattern. | |
181 | ||
86c91f91 GB |
182 | --ignore-space-change:: |
183 | --ignore-whitespace:: | |
184 | When applying a patch, ignore changes in whitespace in context | |
185 | lines if necessary. | |
186 | Context lines will preserve their whitespace, and they will not | |
187 | undergo whitespace fixing regardless of the value of the | |
188 | `--whitespace` option. New lines will still be fixed, though. | |
189 | ||
91af7ae5 JH |
190 | --whitespace=<action>:: |
191 | When applying a patch, detect a new or modified line that has | |
192 | whitespace errors. What are considered whitespace errors is | |
193 | controlled by `core.whitespace` configuration. By default, | |
194 | trailing whitespaces (including lines that solely consist of | |
195 | whitespaces) and a space character that is immediately followed | |
196 | by a tab character inside the initial indent of the line are | |
197 | considered whitespace errors. | |
198 | + | |
199 | By default, the command outputs warning messages but applies the patch. | |
eb006ccf | 200 | When `git-apply` is used for statistics and not applying a |
91af7ae5 JH |
201 | patch, it defaults to `nowarn`. |
202 | + | |
1d035f85 | 203 | You can use different `<action>` values to control this |
91af7ae5 | 204 | behavior: |
8273c79a JH |
205 | + |
206 | * `nowarn` turns off the trailing whitespace warning. | |
207 | * `warn` outputs warnings for a few such errors, but applies the | |
91af7ae5 JH |
208 | patch as-is (default). |
209 | * `fix` outputs warnings for a few such errors, and applies the | |
210 | patch after fixing them (`strip` is a synonym --- the tool | |
1d035f85 | 211 | used to consider only trailing whitespace characters as errors, and the |
2de9b711 | 212 | fix involved 'stripping' them, but modern Gits do more). |
8273c79a JH |
213 | * `error` outputs warnings for a few such errors, and refuses |
214 | to apply the patch. | |
215 | * `error-all` is similar to `error` but shows all errors. | |
8273c79a | 216 | |
f847c07b | 217 | --inaccurate-eof:: |
0979c106 | 218 | Under certain circumstances, some versions of 'diff' do not correctly |
5684ed6d | 219 | detect a missing new-line at the end of the file. As a result, patches |
0979c106 | 220 | created by such 'diff' programs do not record incomplete lines |
5684ed6d JF |
221 | correctly. This option adds support for applying such patches by |
222 | working around this bug. | |
223 | ||
3240240f SB |
224 | -v:: |
225 | --verbose:: | |
5684ed6d JF |
226 | Report progress to stderr. By default, only a message about the |
227 | current patch being applied will be printed. This option will cause | |
228 | additional information to be reported. | |
8273c79a | 229 | |
c14b9d1e JS |
230 | --recount:: |
231 | Do not trust the line counts in the hunk headers, but infer them | |
232 | by inspecting the patch (e.g. after editing the patch without | |
233 | adjusting the hunk headers appropriately). | |
234 | ||
f5563887 | 235 | --directory=<root>:: |
1d035f85 | 236 | Prepend <root> to all filenames. If a "-p" argument was also passed, |
c4730f35 | 237 | it is applied before prepending the new root. |
f5563887 JH |
238 | + |
239 | For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` | |
240 | can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by | |
241 | running `git apply --directory=modules/git-gui`. | |
c4730f35 | 242 | |
c536c075 JH |
243 | --unsafe-paths:: |
244 | By default, a patch that affects outside the working area | |
245 | (either a Git controlled working tree, or the current working | |
246 | directory when "git apply" is used as a replacement of GNU | |
247 | patch) is rejected as a mistake (or a mischief). | |
248 | + | |
249 | When `git apply` is used as a "better GNU patch", the user can pass | |
250 | the `--unsafe-paths` option to override this safety check. This option | |
251 | has no effect when `--index` or `--cached` is in use. | |
252 | ||
76a8788c | 253 | CONFIGURATION |
8273c79a JH |
254 | ------------- |
255 | ||
da0005b8 | 256 | apply.ignoreWhitespace:: |
86c91f91 GB |
257 | Set to 'change' if you want changes in whitespace to be ignored by default. |
258 | Set to one of: no, none, never, false if you want changes in | |
259 | whitespace to be significant. | |
8273c79a JH |
260 | apply.whitespace:: |
261 | When no `--whitespace` flag is given from the command | |
262 | line, this configuration item is used as the default. | |
263 | ||
76a8788c | 264 | SUBMODULES |
e06c5a6c | 265 | ---------- |
0b444cdb | 266 | If the patch contains any changes to submodules then 'git apply' |
e06c5a6c SV |
267 | treats these changes as follows. |
268 | ||
f9821e2b | 269 | If `--index` is specified (explicitly or implicitly), then the submodule |
e06c5a6c SV |
270 | commits must match the index exactly for the patch to apply. If any |
271 | of the submodules are checked-out, then these check-outs are completely | |
7560f547 | 272 | ignored, i.e., they are not required to be up to date or clean and they |
e06c5a6c SV |
273 | are not updated. |
274 | ||
f9821e2b | 275 | If `--index` is not specified, then the submodule commits in the patch |
1d035f85 | 276 | are ignored and only the absence or presence of the corresponding |
e06c5a6c | 277 | subdirectory is checked and (if possible) updated. |
8273c79a | 278 | |
08b29826 BK |
279 | SEE ALSO |
280 | -------- | |
281 | linkgit:git-am[1]. | |
282 | ||
d0587fd5 JH |
283 | GIT |
284 | --- | |
9e1f0a85 | 285 | Part of the linkgit:git[1] suite |