]>
Commit | Line | Data |
---|---|---|
88e7fdf2 JH |
1 | gitattributes(5) |
2 | ================ | |
3 | ||
4 | NAME | |
5 | ---- | |
6 | gitattributes - defining attributes per path | |
7 | ||
8 | SYNOPSIS | |
9 | -------- | |
e5b5c1d2 | 10 | $GIT_DIR/info/attributes, .gitattributes |
88e7fdf2 JH |
11 | |
12 | ||
13 | DESCRIPTION | |
14 | ----------- | |
15 | ||
16 | A `gitattributes` file is a simple text file that gives | |
17 | `attributes` to pathnames. | |
18 | ||
19 | Each line in `gitattributes` file is of form: | |
20 | ||
3f74c8e8 | 21 | pattern attr1 attr2 ... |
88e7fdf2 | 22 | |
3f74c8e8 JS |
23 | That is, a pattern followed by an attributes list, |
24 | separated by whitespaces. When the pattern matches the | |
88e7fdf2 JH |
25 | path in question, the attributes listed on the line are given to |
26 | the path. | |
27 | ||
28 | Each attribute can be in one of these states for a given path: | |
29 | ||
30 | Set:: | |
31 | ||
32 | The path has the attribute with special value "true"; | |
33 | this is specified by listing only the name of the | |
34 | attribute in the attribute list. | |
35 | ||
36 | Unset:: | |
37 | ||
38 | The path has the attribute with special value "false"; | |
39 | this is specified by listing the name of the attribute | |
40 | prefixed with a dash `-` in the attribute list. | |
41 | ||
42 | Set to a value:: | |
43 | ||
44 | The path has the attribute with specified string value; | |
45 | this is specified by listing the name of the attribute | |
46 | followed by an equal sign `=` and its value in the | |
47 | attribute list. | |
48 | ||
49 | Unspecified:: | |
50 | ||
3f74c8e8 | 51 | No pattern matches the path, and nothing says if |
b9d14ffb JH |
52 | the path has or does not have the attribute, the |
53 | attribute for the path is said to be Unspecified. | |
88e7fdf2 | 54 | |
3f74c8e8 | 55 | When more than one pattern matches the path, a later line |
b9d14ffb | 56 | overrides an earlier line. This overriding is done per |
3f74c8e8 JS |
57 | attribute. The rules how the pattern matches paths are the |
58 | same as in `.gitignore` files; see linkgit:gitignore[5]. | |
82dce998 | 59 | Unlike `.gitignore`, negative patterns are forbidden. |
88e7fdf2 | 60 | |
2de9b711 | 61 | When deciding what attributes are assigned to a path, Git |
88e7fdf2 JH |
62 | consults `$GIT_DIR/info/attributes` file (which has the highest |
63 | precedence), `.gitattributes` file in the same directory as the | |
20ff3ec2 JM |
64 | path in question, and its parent directories up to the toplevel of the |
65 | work tree (the further the directory that contains `.gitattributes` | |
6df42ab9 PO |
66 | is from the path in question, the lower its precedence). Finally |
67 | global and system-wide files are considered (they have the lowest | |
68 | precedence). | |
88e7fdf2 | 69 | |
40701adb NTND |
70 | When the `.gitattributes` file is missing from the work tree, the |
71 | path in the index is used as a fall-back. During checkout process, | |
72 | `.gitattributes` in the index is used and then the file in the | |
73 | working tree is used as a fall-back. | |
74 | ||
90b22907 | 75 | If you wish to affect only a single repository (i.e., to assign |
6df42ab9 PO |
76 | attributes to files that are particular to |
77 | one user's workflow for that repository), then | |
90b22907 JK |
78 | attributes should be placed in the `$GIT_DIR/info/attributes` file. |
79 | Attributes which should be version-controlled and distributed to other | |
80 | repositories (i.e., attributes of interest to all users) should go into | |
6df42ab9 PO |
81 | `.gitattributes` files. Attributes that should affect all repositories |
82 | for a single user should be placed in a file specified by the | |
da0005b8 | 83 | `core.attributesFile` configuration option (see linkgit:git-config[1]). |
684e40f6 HKNN |
84 | Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME |
85 | is either not set or empty, $HOME/.config/git/attributes is used instead. | |
6df42ab9 PO |
86 | Attributes for all users on a system should be placed in the |
87 | `$(prefix)/etc/gitattributes` file. | |
90b22907 | 88 | |
88e7fdf2 | 89 | Sometimes you would need to override an setting of an attribute |
0922570c | 90 | for a path to `Unspecified` state. This can be done by listing |
88e7fdf2 JH |
91 | the name of the attribute prefixed with an exclamation point `!`. |
92 | ||
93 | ||
94 | EFFECTS | |
95 | ------- | |
96 | ||
2de9b711 | 97 | Certain operations by Git can be influenced by assigning |
ae7aa499 JH |
98 | particular attributes to a path. Currently, the following |
99 | operations are attributes-aware. | |
88e7fdf2 JH |
100 | |
101 | Checking-out and checking-in | |
102 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
103 | ||
3fed15f5 | 104 | These attributes affect how the contents stored in the |
88e7fdf2 | 105 | repository are copied to the working tree files when commands |
0b444cdb | 106 | such as 'git checkout' and 'git merge' run. They also affect how |
2de9b711 | 107 | Git stores the contents you prepare in the working tree in the |
0b444cdb | 108 | repository upon 'git add' and 'git commit'. |
88e7fdf2 | 109 | |
5ec3e670 | 110 | `text` |
3fed15f5 JH |
111 | ^^^^^^ |
112 | ||
fd6cce9e EB |
113 | This attribute enables and controls end-of-line normalization. When a |
114 | text file is normalized, its line endings are converted to LF in the | |
115 | repository. To control what line ending style is used in the working | |
116 | directory, use the `eol` attribute for a single file and the | |
942e7747 | 117 | `core.eol` configuration variable for all text files. |
65237284 | 118 | Note that `core.autocrlf` overrides `core.eol` |
3fed15f5 | 119 | |
88e7fdf2 JH |
120 | Set:: |
121 | ||
5ec3e670 | 122 | Setting the `text` attribute on a path enables end-of-line |
fd6cce9e EB |
123 | normalization and marks the path as a text file. End-of-line |
124 | conversion takes place without guessing the content type. | |
88e7fdf2 JH |
125 | |
126 | Unset:: | |
127 | ||
2de9b711 | 128 | Unsetting the `text` attribute on a path tells Git not to |
bbb896d8 | 129 | attempt any end-of-line conversion upon checkin or checkout. |
88e7fdf2 | 130 | |
fd6cce9e | 131 | Set to string value "auto":: |
88e7fdf2 | 132 | |
5ec3e670 | 133 | When `text` is set to "auto", the path is marked for automatic |
65237284 TB |
134 | end-of-line conversion. If Git decides that the content is |
135 | text, its line endings are converted to LF on checkin. | |
136 | When the file has been commited with CRLF, no conversion is done. | |
88e7fdf2 | 137 | |
88e7fdf2 JH |
138 | Unspecified:: |
139 | ||
2de9b711 | 140 | If the `text` attribute is unspecified, Git uses the |
942e7747 EB |
141 | `core.autocrlf` configuration variable to determine if the |
142 | file should be converted. | |
88e7fdf2 | 143 | |
2de9b711 | 144 | Any other value causes Git to act as if `text` has been left |
fd6cce9e | 145 | unspecified. |
88e7fdf2 | 146 | |
fd6cce9e EB |
147 | `eol` |
148 | ^^^^^ | |
88e7fdf2 | 149 | |
fd6cce9e | 150 | This attribute sets a specific line-ending style to be used in the |
65237284 | 151 | working directory. It enables end-of-line conversion without any |
942e7747 | 152 | content checks, effectively setting the `text` attribute. |
88e7fdf2 | 153 | |
fd6cce9e | 154 | Set to string value "crlf":: |
88e7fdf2 | 155 | |
2de9b711 | 156 | This setting forces Git to normalize line endings for this |
942e7747 EB |
157 | file on checkin and convert them to CRLF when the file is |
158 | checked out. | |
fd6cce9e EB |
159 | |
160 | Set to string value "lf":: | |
161 | ||
2de9b711 | 162 | This setting forces Git to normalize line endings to LF on |
fd6cce9e | 163 | checkin and prevents conversion to CRLF when the file is |
942e7747 | 164 | checked out. |
5ec3e670 EB |
165 | |
166 | Backwards compatibility with `crlf` attribute | |
167 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
168 | ||
169 | For backwards compatibility, the `crlf` attribute is interpreted as | |
170 | follows: | |
171 | ||
172 | ------------------------ | |
173 | crlf text | |
174 | -crlf -text | |
175 | crlf=input eol=lf | |
176 | ------------------------ | |
fd6cce9e EB |
177 | |
178 | End-of-line conversion | |
179 | ^^^^^^^^^^^^^^^^^^^^^^ | |
180 | ||
2de9b711 | 181 | While Git normally leaves file contents alone, it can be configured to |
fd6cce9e EB |
182 | normalize line endings to LF in the repository and, optionally, to |
183 | convert them to CRLF when files are checked out. | |
184 | ||
2de9b711 | 185 | Here is an example that will make Git normalize .txt, .vcproj and .sh |
fd6cce9e EB |
186 | files, ensure that .vcproj files have CRLF and .sh files have LF in |
187 | the working directory, and prevent .jpg files from being normalized | |
188 | regardless of their content. | |
189 | ||
190 | ------------------------ | |
65237284 | 191 | * text=auto |
5ec3e670 | 192 | *.txt text |
65237284 TB |
193 | *.vcproj text eol=crlf |
194 | *.sh text eol=lf | |
5ec3e670 | 195 | *.jpg -text |
fd6cce9e EB |
196 | ------------------------ |
197 | ||
198 | Other source code management systems normalize all text files in their | |
199 | repositories, and there are two ways to enable similar automatic | |
2de9b711 | 200 | normalization in Git. |
fd6cce9e EB |
201 | |
202 | If you simply want to have CRLF line endings in your working directory | |
203 | regardless of the repository you are working with, you can set the | |
65237284 | 204 | config variable "core.autocrlf" without using any attributes. |
fd6cce9e EB |
205 | |
206 | ------------------------ | |
207 | [core] | |
208 | autocrlf = true | |
209 | ------------------------ | |
210 | ||
211 | This does not force normalization of all text files, but does ensure | |
212 | that text files that you introduce to the repository have their line | |
213 | endings normalized to LF when they are added, and that files that are | |
942e7747 | 214 | already normalized in the repository stay normalized. |
fd6cce9e EB |
215 | |
216 | If you want to interoperate with a source code management system that | |
217 | enforces end-of-line normalization, or you simply want all text files | |
5ec3e670 | 218 | in your repository to be normalized, you should instead set the `text` |
fd6cce9e | 219 | attribute to "auto" for _all_ files. |
88e7fdf2 | 220 | |
fd6cce9e | 221 | ------------------------ |
5ec3e670 | 222 | * text=auto |
fd6cce9e EB |
223 | ------------------------ |
224 | ||
2de9b711 | 225 | This ensures that all files that Git considers to be text will have |
942e7747 | 226 | normalized (LF) line endings in the repository. The `core.eol` |
2de9b711 | 227 | configuration variable controls which line endings Git will use for |
942e7747 EB |
228 | normalized files in your working directory; the default is to use the |
229 | native line ending for your platform, or CRLF if `core.autocrlf` is | |
230 | set. | |
fd6cce9e | 231 | |
5ec3e670 | 232 | NOTE: When `text=auto` normalization is enabled in an existing |
fd6cce9e EB |
233 | repository, any text files containing CRLFs should be normalized. If |
234 | they are not they will be normalized the next time someone tries to | |
235 | change them, causing unfortunate misattribution. From a clean working | |
236 | directory: | |
237 | ||
238 | ------------------------------------------------- | |
5ec3e670 | 239 | $ echo "* text=auto" >>.gitattributes |
2de9b711 | 240 | $ rm .git/index # Remove the index to force Git to |
fd6cce9e EB |
241 | $ git reset # re-scan the working directory |
242 | $ git status # Show files that will be normalized | |
243 | $ git add -u | |
244 | $ git add .gitattributes | |
245 | $ git commit -m "Introduce end-of-line normalization" | |
246 | ------------------------------------------------- | |
247 | ||
248 | If any files that should not be normalized show up in 'git status', | |
5ec3e670 | 249 | unset their `text` attribute before running 'git add -u'. |
fd6cce9e EB |
250 | |
251 | ------------------------ | |
5ec3e670 | 252 | manual.pdf -text |
fd6cce9e | 253 | ------------------------ |
88e7fdf2 | 254 | |
2de9b711 | 255 | Conversely, text files that Git does not detect can have normalization |
fd6cce9e | 256 | enabled manually. |
88e7fdf2 | 257 | |
fd6cce9e | 258 | ------------------------ |
5ec3e670 | 259 | weirdchars.txt text |
fd6cce9e | 260 | ------------------------ |
88e7fdf2 | 261 | |
2de9b711 | 262 | If `core.safecrlf` is set to "true" or "warn", Git verifies if |
21e5ad50 | 263 | the conversion is reversible for the current setting of |
2de9b711 TA |
264 | `core.autocrlf`. For "true", Git rejects irreversible |
265 | conversions; for "warn", Git only prints a warning but accepts | |
21e5ad50 SP |
266 | an irreversible conversion. The safety triggers to prevent such |
267 | a conversion done to the files in the work tree, but there are a | |
268 | few exceptions. Even though... | |
269 | ||
0b444cdb | 270 | - 'git add' itself does not touch the files in the work tree, the |
21e5ad50 SP |
271 | next checkout would, so the safety triggers; |
272 | ||
0b444cdb | 273 | - 'git apply' to update a text file with a patch does touch the files |
21e5ad50 SP |
274 | in the work tree, but the operation is about text files and CRLF |
275 | conversion is about fixing the line ending inconsistencies, so the | |
276 | safety does not trigger; | |
277 | ||
0b444cdb TR |
278 | - 'git diff' itself does not touch the files in the work tree, it is |
279 | often run to inspect the changes you intend to next 'git add'. To | |
21e5ad50 SP |
280 | catch potential problems early, safety triggers. |
281 | ||
88e7fdf2 | 282 | |
3fed15f5 JH |
283 | `ident` |
284 | ^^^^^^^ | |
285 | ||
2de9b711 | 286 | When the attribute `ident` is set for a path, Git replaces |
2c850f12 | 287 | `$Id$` in the blob object with `$Id:`, followed by the |
3fed15f5 JH |
288 | 40-character hexadecimal blob object name, followed by a dollar |
289 | sign `$` upon checkout. Any byte sequence that begins with | |
af9b54bb AP |
290 | `$Id:` and ends with `$` in the worktree file is replaced |
291 | with `$Id$` upon check-in. | |
3fed15f5 JH |
292 | |
293 | ||
aa4ed402 JH |
294 | `filter` |
295 | ^^^^^^^^ | |
296 | ||
c05ef938 | 297 | A `filter` attribute can be set to a string value that names a |
aa4ed402 JH |
298 | filter driver specified in the configuration. |
299 | ||
c05ef938 | 300 | A filter driver consists of a `clean` command and a `smudge` |
aa4ed402 | 301 | command, either of which can be left unspecified. Upon |
c05ef938 WC |
302 | checkout, when the `smudge` command is specified, the command is |
303 | fed the blob object from its standard input, and its standard | |
304 | output is used to update the worktree file. Similarly, the | |
305 | `clean` command is used to convert the contents of worktree file | |
306 | upon checkin. | |
aa4ed402 | 307 | |
36daaaca JB |
308 | One use of the content filtering is to massage the content into a shape |
309 | that is more convenient for the platform, filesystem, and the user to use. | |
310 | For this mode of operation, the key phrase here is "more convenient" and | |
311 | not "turning something unusable into usable". In other words, the intent | |
312 | is that if someone unsets the filter driver definition, or does not have | |
313 | the appropriate filter program, the project should still be usable. | |
314 | ||
315 | Another use of the content filtering is to store the content that cannot | |
316 | be directly used in the repository (e.g. a UUID that refers to the true | |
2de9b711 | 317 | content stored outside Git, or an encrypted content) and turn it into a |
36daaaca JB |
318 | usable form upon checkout (e.g. download the external content, or decrypt |
319 | the encrypted content). | |
320 | ||
321 | These two filters behave differently, and by default, a filter is taken as | |
322 | the former, massaging the contents into more convenient shape. A missing | |
323 | filter driver definition in the config, or a filter driver that exits with | |
324 | a non-zero status, is not an error but makes the filter a no-op passthru. | |
325 | ||
326 | You can declare that a filter turns a content that by itself is unusable | |
327 | into a usable content by setting the filter.<driver>.required configuration | |
328 | variable to `true`. | |
aa4ed402 | 329 | |
d79f5d17 NS |
330 | For example, in .gitattributes, you would assign the `filter` |
331 | attribute for paths. | |
332 | ||
333 | ------------------------ | |
334 | *.c filter=indent | |
335 | ------------------------ | |
336 | ||
337 | Then you would define a "filter.indent.clean" and "filter.indent.smudge" | |
338 | configuration in your .git/config to specify a pair of commands to | |
339 | modify the contents of C programs when the source files are checked | |
340 | in ("clean" is run) and checked out (no change is made because the | |
341 | command is "cat"). | |
342 | ||
343 | ------------------------ | |
344 | [filter "indent"] | |
345 | clean = indent | |
346 | smudge = cat | |
347 | ------------------------ | |
348 | ||
f217f0e8 EB |
349 | For best results, `clean` should not alter its output further if it is |
350 | run twice ("clean->clean" should be equivalent to "clean"), and | |
351 | multiple `smudge` commands should not alter `clean`'s output | |
352 | ("smudge->smudge->clean" should be equivalent to "clean"). See the | |
353 | section on merging below. | |
354 | ||
355 | The "indent" filter is well-behaved in this regard: it will not modify | |
356 | input that is already correctly indented. In this case, the lack of a | |
357 | smudge filter means that the clean filter _must_ accept its own output | |
358 | without modifying it. | |
359 | ||
36daaaca JB |
360 | If a filter _must_ succeed in order to make the stored contents usable, |
361 | you can declare that the filter is `required`, in the configuration: | |
362 | ||
363 | ------------------------ | |
364 | [filter "crypt"] | |
365 | clean = openssl enc ... | |
366 | smudge = openssl enc -d ... | |
367 | required | |
368 | ------------------------ | |
369 | ||
a2b665de PW |
370 | Sequence "%f" on the filter command line is replaced with the name of |
371 | the file the filter is working on. A filter might use this in keyword | |
372 | substitution. For example: | |
373 | ||
374 | ------------------------ | |
375 | [filter "p4"] | |
376 | clean = git-p4-filter --clean %f | |
377 | smudge = git-p4-filter --smudge %f | |
378 | ------------------------ | |
379 | ||
52db4b04 JH |
380 | Note that "%f" is the name of the path that is being worked on. Depending |
381 | on the version that is being filtered, the corresponding file on disk may | |
382 | not exist, or may have different contents. So, smudge and clean commands | |
383 | should not try to access the file on disk, but only act as filters on the | |
384 | content provided to them on standard input. | |
aa4ed402 JH |
385 | |
386 | Interaction between checkin/checkout attributes | |
387 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
388 | ||
389 | In the check-in codepath, the worktree file is first converted | |
390 | with `filter` driver (if specified and corresponding driver | |
391 | defined), then the result is processed with `ident` (if | |
5ec3e670 | 392 | specified), and then finally with `text` (again, if specified |
aa4ed402 JH |
393 | and applicable). |
394 | ||
395 | In the check-out codepath, the blob content is first converted | |
5ec3e670 | 396 | with `text`, and then `ident` and fed to `filter`. |
aa4ed402 JH |
397 | |
398 | ||
f217f0e8 EB |
399 | Merging branches with differing checkin/checkout attributes |
400 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
401 | ||
402 | If you have added attributes to a file that cause the canonical | |
403 | repository format for that file to change, such as adding a | |
404 | clean/smudge filter or text/eol/ident attributes, merging anything | |
405 | where the attribute is not in place would normally cause merge | |
406 | conflicts. | |
407 | ||
2de9b711 | 408 | To prevent these unnecessary merge conflicts, Git can be told to run a |
f217f0e8 EB |
409 | virtual check-out and check-in of all three stages of a file when |
410 | resolving a three-way merge by setting the `merge.renormalize` | |
411 | configuration variable. This prevents changes caused by check-in | |
412 | conversion from causing spurious merge conflicts when a converted file | |
413 | is merged with an unconverted file. | |
414 | ||
415 | As long as a "smudge->clean" results in the same output as a "clean" | |
416 | even on files that are already smudged, this strategy will | |
417 | automatically resolve all filter-related conflicts. Filters that do | |
418 | not act in this way may cause additional merge conflicts that must be | |
419 | resolved manually. | |
420 | ||
421 | ||
88e7fdf2 JH |
422 | Generating diff text |
423 | ~~~~~~~~~~~~~~~~~~~~ | |
424 | ||
4f73e240 JN |
425 | `diff` |
426 | ^^^^^^ | |
427 | ||
2de9b711 TA |
428 | The attribute `diff` affects how Git generates diffs for particular |
429 | files. It can tell Git whether to generate a textual patch for the path | |
678852d9 | 430 | or to treat the path as a binary file. It can also affect what line is |
2de9b711 TA |
431 | shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an |
432 | external command to generate the diff, or ask Git to convert binary | |
678852d9 | 433 | files to a text format before generating the diff. |
88e7fdf2 JH |
434 | |
435 | Set:: | |
436 | ||
437 | A path to which the `diff` attribute is set is treated | |
438 | as text, even when they contain byte values that | |
439 | normally never appear in text files, such as NUL. | |
440 | ||
441 | Unset:: | |
442 | ||
443 | A path to which the `diff` attribute is unset will | |
678852d9 JK |
444 | generate `Binary files differ` (or a binary patch, if |
445 | binary patches are enabled). | |
88e7fdf2 JH |
446 | |
447 | Unspecified:: | |
448 | ||
449 | A path to which the `diff` attribute is unspecified | |
450 | first gets its contents inspected, and if it looks like | |
6bf3b813 NTND |
451 | text and is smaller than core.bigFileThreshold, it is treated |
452 | as text. Otherwise it would generate `Binary files differ`. | |
88e7fdf2 | 453 | |
2cc3167c JH |
454 | String:: |
455 | ||
678852d9 JK |
456 | Diff is shown using the specified diff driver. Each driver may |
457 | specify one or more options, as described in the following | |
458 | section. The options for the diff driver "foo" are defined | |
459 | by the configuration variables in the "diff.foo" section of the | |
2de9b711 | 460 | Git config file. |
2cc3167c JH |
461 | |
462 | ||
678852d9 JK |
463 | Defining an external diff driver |
464 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
2cc3167c JH |
465 | |
466 | The definition of a diff driver is done in `gitconfig`, not | |
467 | `gitattributes` file, so strictly speaking this manual page is a | |
468 | wrong place to talk about it. However... | |
469 | ||
678852d9 | 470 | To define an external diff driver `jcdiff`, add a section to your |
2cc3167c JH |
471 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
472 | ||
473 | ---------------------------------------------------------------- | |
474 | [diff "jcdiff"] | |
475 | command = j-c-diff | |
476 | ---------------------------------------------------------------- | |
477 | ||
2de9b711 | 478 | When Git needs to show you a diff for the path with `diff` |
2cc3167c JH |
479 | attribute set to `jcdiff`, it calls the command you specified |
480 | with the above configuration, i.e. `j-c-diff`, with 7 | |
481 | parameters, just like `GIT_EXTERNAL_DIFF` program is called. | |
9e1f0a85 | 482 | See linkgit:git[1] for details. |
88e7fdf2 JH |
483 | |
484 | ||
ae7aa499 JH |
485 | Defining a custom hunk-header |
486 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
487 | ||
c882c01e | 488 | Each group of changes (called a "hunk") in the textual diff output |
ae7aa499 JH |
489 | is prefixed with a line of the form: |
490 | ||
491 | @@ -k,l +n,m @@ TEXT | |
492 | ||
c882c01e GD |
493 | This is called a 'hunk header'. The "TEXT" portion is by default a line |
494 | that begins with an alphabet, an underscore or a dollar sign; this | |
495 | matches what GNU 'diff -p' output uses. This default selection however | |
496 | is not suited for some contents, and you can use a customized pattern | |
497 | to make a selection. | |
ae7aa499 | 498 | |
c882c01e | 499 | First, in .gitattributes, you would assign the `diff` attribute |
ae7aa499 JH |
500 | for paths. |
501 | ||
502 | ------------------------ | |
503 | *.tex diff=tex | |
504 | ------------------------ | |
505 | ||
edb7e82f | 506 | Then, you would define a "diff.tex.xfuncname" configuration to |
ae7aa499 | 507 | specify a regular expression that matches a line that you would |
c4c86d23 JK |
508 | want to appear as the hunk header "TEXT". Add a section to your |
509 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
ae7aa499 JH |
510 | |
511 | ------------------------ | |
512 | [diff "tex"] | |
45d9414f | 513 | xfuncname = "^(\\\\(sub)*section\\{.*)$" |
ae7aa499 JH |
514 | ------------------------ |
515 | ||
516 | Note. A single level of backslashes are eaten by the | |
517 | configuration file parser, so you would need to double the | |
518 | backslashes; the pattern above picks a line that begins with a | |
02783075 | 519 | backslash, and zero or more occurrences of `sub` followed by |
ae7aa499 JH |
520 | `section` followed by open brace, to the end of line. |
521 | ||
522 | There are a few built-in patterns to make this easier, and `tex` | |
523 | is one of them, so you do not have to write the above in your | |
524 | configuration file (you still need to enable this with the | |
d08ed6d6 GH |
525 | attribute mechanism, via `.gitattributes`). The following built in |
526 | patterns are available: | |
527 | ||
e90d065e AJ |
528 | - `ada` suitable for source code in the Ada language. |
529 | ||
23b5beb2 GH |
530 | - `bibtex` suitable for files with BibTeX coded references. |
531 | ||
80c49c3d TR |
532 | - `cpp` suitable for source code in the C and C++ languages. |
533 | ||
b221207d PO |
534 | - `csharp` suitable for source code in the C# language. |
535 | ||
909a5494 BC |
536 | - `fortran` suitable for source code in the Fortran language. |
537 | ||
69f9c87d ZB |
538 | - `fountain` suitable for Fountain documents. |
539 | ||
af9ce1ff AE |
540 | - `html` suitable for HTML/XHTML documents. |
541 | ||
b66e00f1 | 542 | - `java` suitable for source code in the Java language. |
d08ed6d6 | 543 | |
53b10a14 GH |
544 | - `matlab` suitable for source code in the MATLAB language. |
545 | ||
5d1e958e JS |
546 | - `objc` suitable for source code in the Objective-C language. |
547 | ||
d08ed6d6 GH |
548 | - `pascal` suitable for source code in the Pascal/Delphi language. |
549 | ||
71a5d4bc JN |
550 | - `perl` suitable for source code in the Perl language. |
551 | ||
af9ce1ff AE |
552 | - `php` suitable for source code in the PHP language. |
553 | ||
7c17205b KS |
554 | - `python` suitable for source code in the Python language. |
555 | ||
d08ed6d6 GH |
556 | - `ruby` suitable for source code in the Ruby language. |
557 | ||
558 | - `tex` suitable for source code for LaTeX documents. | |
ae7aa499 JH |
559 | |
560 | ||
80c49c3d TR |
561 | Customizing word diff |
562 | ^^^^^^^^^^^^^^^^^^^^^ | |
563 | ||
882749a0 | 564 | You can customize the rules that `git diff --word-diff` uses to |
80c49c3d | 565 | split words in a line, by specifying an appropriate regular expression |
ae3b970a | 566 | in the "diff.*.wordRegex" configuration variable. For example, in TeX |
80c49c3d TR |
567 | a backslash followed by a sequence of letters forms a command, but |
568 | several such commands can be run together without intervening | |
c4c86d23 JK |
569 | whitespace. To separate them, use a regular expression in your |
570 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
80c49c3d TR |
571 | |
572 | ------------------------ | |
573 | [diff "tex"] | |
ae3b970a | 574 | wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" |
80c49c3d TR |
575 | ------------------------ |
576 | ||
577 | A built-in pattern is provided for all languages listed in the | |
578 | previous section. | |
579 | ||
580 | ||
678852d9 JK |
581 | Performing text diffs of binary files |
582 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
583 | ||
584 | Sometimes it is desirable to see the diff of a text-converted | |
585 | version of some binary files. For example, a word processor | |
586 | document can be converted to an ASCII text representation, and | |
587 | the diff of the text shown. Even though this conversion loses | |
588 | some information, the resulting diff is useful for human | |
589 | viewing (but cannot be applied directly). | |
590 | ||
591 | The `textconv` config option is used to define a program for | |
592 | performing such a conversion. The program should take a single | |
593 | argument, the name of a file to convert, and produce the | |
594 | resulting text on stdout. | |
595 | ||
596 | For example, to show the diff of the exif information of a | |
597 | file instead of the binary information (assuming you have the | |
c4c86d23 JK |
598 | exif tool installed), add the following section to your |
599 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file): | |
678852d9 JK |
600 | |
601 | ------------------------ | |
602 | [diff "jpg"] | |
603 | textconv = exif | |
604 | ------------------------ | |
605 | ||
606 | NOTE: The text conversion is generally a one-way conversion; | |
607 | in this example, we lose the actual image contents and focus | |
608 | just on the text data. This means that diffs generated by | |
609 | textconv are _not_ suitable for applying. For this reason, | |
610 | only `git diff` and the `git log` family of commands (i.e., | |
611 | log, whatchanged, show) will perform text conversion. `git | |
612 | format-patch` will never generate this output. If you want to | |
613 | send somebody a text-converted diff of a binary file (e.g., | |
614 | because it quickly conveys the changes you have made), you | |
615 | should generate it separately and send it as a comment _in | |
616 | addition to_ the usual binary diff that you might send. | |
617 | ||
d9bae1a1 | 618 | Because text conversion can be slow, especially when doing a |
2de9b711 | 619 | large number of them with `git log -p`, Git provides a mechanism |
d9bae1a1 JK |
620 | to cache the output and use it in future diffs. To enable |
621 | caching, set the "cachetextconv" variable in your diff driver's | |
622 | config. For example: | |
623 | ||
624 | ------------------------ | |
625 | [diff "jpg"] | |
626 | textconv = exif | |
627 | cachetextconv = true | |
628 | ------------------------ | |
629 | ||
630 | This will cache the result of running "exif" on each blob | |
631 | indefinitely. If you change the textconv config variable for a | |
2de9b711 | 632 | diff driver, Git will automatically invalidate the cache entries |
d9bae1a1 JK |
633 | and re-run the textconv filter. If you want to invalidate the |
634 | cache manually (e.g., because your version of "exif" was updated | |
635 | and now produces better output), you can remove the cache | |
636 | manually with `git update-ref -d refs/notes/textconv/jpg` (where | |
637 | "jpg" is the name of the diff driver, as in the example above). | |
678852d9 | 638 | |
55601c6a JK |
639 | Choosing textconv versus external diff |
640 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
641 | ||
642 | If you want to show differences between binary or specially-formatted | |
643 | blobs in your repository, you can choose to use either an external diff | |
644 | command, or to use textconv to convert them to a diff-able text format. | |
645 | Which method you choose depends on your exact situation. | |
646 | ||
647 | The advantage of using an external diff command is flexibility. You are | |
648 | not bound to find line-oriented changes, nor is it necessary for the | |
649 | output to resemble unified diff. You are free to locate and report | |
650 | changes in the most appropriate way for your data format. | |
651 | ||
652 | A textconv, by comparison, is much more limiting. You provide a | |
2de9b711 | 653 | transformation of the data into a line-oriented text format, and Git |
55601c6a JK |
654 | uses its regular diff tools to generate the output. There are several |
655 | advantages to choosing this method: | |
656 | ||
657 | 1. Ease of use. It is often much simpler to write a binary to text | |
658 | transformation than it is to perform your own diff. In many cases, | |
659 | existing programs can be used as textconv filters (e.g., exif, | |
660 | odt2txt). | |
661 | ||
662 | 2. Git diff features. By performing only the transformation step | |
2de9b711 | 663 | yourself, you can still utilize many of Git's diff features, |
55601c6a JK |
664 | including colorization, word-diff, and combined diffs for merges. |
665 | ||
666 | 3. Caching. Textconv caching can speed up repeated diffs, such as those | |
667 | you might trigger by running `git log -p`. | |
668 | ||
669 | ||
ab435611 JK |
670 | Marking files as binary |
671 | ^^^^^^^^^^^^^^^^^^^^^^^ | |
672 | ||
673 | Git usually guesses correctly whether a blob contains text or binary | |
674 | data by examining the beginning of the contents. However, sometimes you | |
675 | may want to override its decision, either because a blob contains binary | |
676 | data later in the file, or because the content, while technically | |
677 | composed of text characters, is opaque to a human reader. For example, | |
f745acb0 | 678 | many postscript files contain only ASCII characters, but produce noisy |
ab435611 JK |
679 | and meaningless diffs. |
680 | ||
681 | The simplest way to mark a file as binary is to unset the diff | |
682 | attribute in the `.gitattributes` file: | |
683 | ||
684 | ------------------------ | |
685 | *.ps -diff | |
686 | ------------------------ | |
687 | ||
2de9b711 | 688 | This will cause Git to generate `Binary files differ` (or a binary |
ab435611 JK |
689 | patch, if binary patches are enabled) instead of a regular diff. |
690 | ||
691 | However, one may also want to specify other diff driver attributes. For | |
692 | example, you might want to use `textconv` to convert postscript files to | |
f745acb0 | 693 | an ASCII representation for human viewing, but otherwise treat them as |
ab435611 JK |
694 | binary files. You cannot specify both `-diff` and `diff=ps` attributes. |
695 | The solution is to use the `diff.*.binary` config option: | |
696 | ||
697 | ------------------------ | |
698 | [diff "ps"] | |
699 | textconv = ps2ascii | |
700 | binary = true | |
701 | ------------------------ | |
702 | ||
88e7fdf2 JH |
703 | Performing a three-way merge |
704 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
705 | ||
4f73e240 JN |
706 | `merge` |
707 | ^^^^^^^ | |
708 | ||
b547ce0b | 709 | The attribute `merge` affects how three versions of a file are |
88e7fdf2 | 710 | merged when a file-level merge is necessary during `git merge`, |
57f6ec02 | 711 | and other commands such as `git revert` and `git cherry-pick`. |
88e7fdf2 JH |
712 | |
713 | Set:: | |
714 | ||
715 | Built-in 3-way merge driver is used to merge the | |
2fd02c92 | 716 | contents in a way similar to 'merge' command of `RCS` |
88e7fdf2 JH |
717 | suite. This is suitable for ordinary text files. |
718 | ||
719 | Unset:: | |
720 | ||
721 | Take the version from the current branch as the | |
722 | tentative merge result, and declare that the merge has | |
b547ce0b | 723 | conflicts. This is suitable for binary files that do |
88e7fdf2 JH |
724 | not have a well-defined merge semantics. |
725 | ||
726 | Unspecified:: | |
727 | ||
728 | By default, this uses the same built-in 3-way merge | |
b547ce0b AS |
729 | driver as is the case when the `merge` attribute is set. |
730 | However, the `merge.default` configuration variable can name | |
731 | different merge driver to be used with paths for which the | |
88e7fdf2 JH |
732 | `merge` attribute is unspecified. |
733 | ||
2cc3167c | 734 | String:: |
88e7fdf2 JH |
735 | |
736 | 3-way merge is performed using the specified custom | |
737 | merge driver. The built-in 3-way merge driver can be | |
738 | explicitly specified by asking for "text" driver; the | |
739 | built-in "take the current branch" driver can be | |
b9d14ffb | 740 | requested with "binary". |
88e7fdf2 JH |
741 | |
742 | ||
0e545f75 JH |
743 | Built-in merge drivers |
744 | ^^^^^^^^^^^^^^^^^^^^^^ | |
745 | ||
746 | There are a few built-in low-level merge drivers defined that | |
747 | can be asked for via the `merge` attribute. | |
748 | ||
749 | text:: | |
750 | ||
751 | Usual 3-way file level merge for text files. Conflicted | |
752 | regions are marked with conflict markers `<<<<<<<`, | |
753 | `=======` and `>>>>>>>`. The version from your branch | |
754 | appears before the `=======` marker, and the version | |
755 | from the merged branch appears after the `=======` | |
756 | marker. | |
757 | ||
758 | binary:: | |
759 | ||
760 | Keep the version from your branch in the work tree, but | |
761 | leave the path in the conflicted state for the user to | |
762 | sort out. | |
763 | ||
764 | union:: | |
765 | ||
766 | Run 3-way file level merge for text files, but take | |
767 | lines from both versions, instead of leaving conflict | |
768 | markers. This tends to leave the added lines in the | |
769 | resulting file in random order and the user should | |
770 | verify the result. Do not use this if you do not | |
771 | understand the implications. | |
772 | ||
773 | ||
88e7fdf2 JH |
774 | Defining a custom merge driver |
775 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
776 | ||
0e545f75 JH |
777 | The definition of a merge driver is done in the `.git/config` |
778 | file, not in the `gitattributes` file, so strictly speaking this | |
779 | manual page is a wrong place to talk about it. However... | |
88e7fdf2 JH |
780 | |
781 | To define a custom merge driver `filfre`, add a section to your | |
782 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
783 | ||
784 | ---------------------------------------------------------------- | |
785 | [merge "filfre"] | |
786 | name = feel-free merge driver | |
ef45bb1f | 787 | driver = filfre %O %A %B %L %P |
88e7fdf2 JH |
788 | recursive = binary |
789 | ---------------------------------------------------------------- | |
790 | ||
791 | The `merge.*.name` variable gives the driver a human-readable | |
792 | name. | |
793 | ||
794 | The `merge.*.driver` variable's value is used to construct a | |
795 | command to run to merge ancestor's version (`%O`), current | |
796 | version (`%A`) and the other branches' version (`%B`). These | |
797 | three tokens are replaced with the names of temporary files that | |
798 | hold the contents of these versions when the command line is | |
16758621 BW |
799 | built. Additionally, %L will be replaced with the conflict marker |
800 | size (see below). | |
88e7fdf2 JH |
801 | |
802 | The merge driver is expected to leave the result of the merge in | |
803 | the file named with `%A` by overwriting it, and exit with zero | |
804 | status if it managed to merge them cleanly, or non-zero if there | |
805 | were conflicts. | |
806 | ||
807 | The `merge.*.recursive` variable specifies what other merge | |
808 | driver to use when the merge driver is called for an internal | |
809 | merge between common ancestors, when there are more than one. | |
810 | When left unspecified, the driver itself is used for both | |
811 | internal merge and the final merge. | |
812 | ||
ef45bb1f JH |
813 | The merge driver can learn the pathname in which the merged result |
814 | will be stored via placeholder `%P`. | |
815 | ||
88e7fdf2 | 816 | |
4c734803 JH |
817 | `conflict-marker-size` |
818 | ^^^^^^^^^^^^^^^^^^^^^^ | |
819 | ||
820 | This attribute controls the length of conflict markers left in | |
821 | the work tree file during a conflicted merge. Only setting to | |
822 | the value to a positive integer has any meaningful effect. | |
823 | ||
824 | For example, this line in `.gitattributes` can be used to tell the merge | |
825 | machinery to leave much longer (instead of the usual 7-character-long) | |
826 | conflict markers when merging the file `Documentation/git-merge.txt` | |
827 | results in a conflict. | |
828 | ||
829 | ------------------------ | |
830 | Documentation/git-merge.txt conflict-marker-size=32 | |
831 | ------------------------ | |
832 | ||
833 | ||
cf1b7869 JH |
834 | Checking whitespace errors |
835 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
836 | ||
837 | `whitespace` | |
838 | ^^^^^^^^^^^^ | |
839 | ||
840 | The `core.whitespace` configuration variable allows you to define what | |
2fd02c92 | 841 | 'diff' and 'apply' should consider whitespace errors for all paths in |
5162e697 | 842 | the project (See linkgit:git-config[1]). This attribute gives you finer |
cf1b7869 JH |
843 | control per path. |
844 | ||
845 | Set:: | |
846 | ||
2de9b711 | 847 | Notice all types of potential whitespace errors known to Git. |
f4b05a49 JS |
848 | The tab width is taken from the value of the `core.whitespace` |
849 | configuration variable. | |
cf1b7869 JH |
850 | |
851 | Unset:: | |
852 | ||
853 | Do not notice anything as error. | |
854 | ||
855 | Unspecified:: | |
856 | ||
f4b05a49 | 857 | Use the value of the `core.whitespace` configuration variable to |
cf1b7869 JH |
858 | decide what to notice as error. |
859 | ||
860 | String:: | |
861 | ||
862 | Specify a comma separate list of common whitespace problems to | |
f4b05a49 | 863 | notice in the same format as the `core.whitespace` configuration |
cf1b7869 JH |
864 | variable. |
865 | ||
866 | ||
8a33dd8b JH |
867 | Creating an archive |
868 | ~~~~~~~~~~~~~~~~~~~ | |
869 | ||
08b51f51 JH |
870 | `export-ignore` |
871 | ^^^^^^^^^^^^^^^ | |
872 | ||
873 | Files and directories with the attribute `export-ignore` won't be added to | |
874 | archive files. | |
875 | ||
8a33dd8b JH |
876 | `export-subst` |
877 | ^^^^^^^^^^^^^^ | |
878 | ||
2de9b711 | 879 | If the attribute `export-subst` is set for a file then Git will expand |
8a33dd8b | 880 | several placeholders when adding this file to an archive. The |
08b51f51 | 881 | expansion depends on the availability of a commit ID, i.e., if |
8a33dd8b JH |
882 | linkgit:git-archive[1] has been given a tree instead of a commit or a |
883 | tag then no replacement will be done. The placeholders are the same | |
884 | as those for the option `--pretty=format:` of linkgit:git-log[1], | |
885 | except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` | |
886 | in the file. E.g. the string `$Format:%H$` will be replaced by the | |
887 | commit hash. | |
888 | ||
889 | ||
975457f1 NG |
890 | Packing objects |
891 | ~~~~~~~~~~~~~~~ | |
892 | ||
893 | `delta` | |
894 | ^^^^^^^ | |
895 | ||
896 | Delta compression will not be attempted for blobs for paths with the | |
897 | attribute `delta` set to false. | |
898 | ||
899 | ||
a2df1fb2 AG |
900 | Viewing files in GUI tools |
901 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
902 | ||
903 | `encoding` | |
904 | ^^^^^^^^^^ | |
905 | ||
906 | The value of this attribute specifies the character encoding that should | |
907 | be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to | |
908 | display the contents of the relevant file. Note that due to performance | |
909 | considerations linkgit:gitk[1] does not use this attribute unless you | |
910 | manually enable per-file encodings in its options. | |
911 | ||
912 | If this attribute is not set or has an invalid value, the value of the | |
913 | `gui.encoding` configuration variable is used instead | |
914 | (See linkgit:git-config[1]). | |
915 | ||
916 | ||
0922570c | 917 | USING MACRO ATTRIBUTES |
bbb896d8 JH |
918 | ---------------------- |
919 | ||
920 | You do not want any end-of-line conversions applied to, nor textual diffs | |
921 | produced for, any binary file you track. You would need to specify e.g. | |
922 | ||
923 | ------------ | |
5ec3e670 | 924 | *.jpg -text -diff |
bbb896d8 JH |
925 | ------------ |
926 | ||
927 | but that may become cumbersome, when you have many attributes. Using | |
0922570c | 928 | macro attributes, you can define an attribute that, when set, also |
98e84066 | 929 | sets or unsets a number of other attributes at the same time. The |
0922570c | 930 | system knows a built-in macro attribute, `binary`: |
bbb896d8 JH |
931 | |
932 | ------------ | |
933 | *.jpg binary | |
934 | ------------ | |
935 | ||
98e84066 | 936 | Setting the "binary" attribute also unsets the "text" and "diff" |
0922570c | 937 | attributes as above. Note that macro attributes can only be "Set", |
98e84066 MH |
938 | though setting one might have the effect of setting or unsetting other |
939 | attributes or even returning other attributes to the "Unspecified" | |
940 | state. | |
bbb896d8 JH |
941 | |
942 | ||
0922570c | 943 | DEFINING MACRO ATTRIBUTES |
bbb896d8 JH |
944 | ------------------------- |
945 | ||
e78e6967 MH |
946 | Custom macro attributes can be defined only in top-level gitattributes |
947 | files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the | |
948 | top level of the working tree, or the global or system-wide | |
949 | gitattributes files), not in `.gitattributes` files in working tree | |
950 | subdirectories. The built-in macro attribute "binary" is equivalent | |
951 | to: | |
bbb896d8 JH |
952 | |
953 | ------------ | |
155a4b71 | 954 | [attr]binary -diff -merge -text |
bbb896d8 JH |
955 | ------------ |
956 | ||
957 | ||
88e7fdf2 JH |
958 | EXAMPLE |
959 | ------- | |
960 | ||
961 | If you have these three `gitattributes` file: | |
962 | ||
963 | ---------------------------------------------------------------- | |
964 | (in $GIT_DIR/info/attributes) | |
965 | ||
966 | a* foo !bar -baz | |
967 | ||
968 | (in .gitattributes) | |
969 | abc foo bar baz | |
970 | ||
971 | (in t/.gitattributes) | |
972 | ab* merge=filfre | |
973 | abc -foo -bar | |
974 | *.c frotz | |
975 | ---------------------------------------------------------------- | |
976 | ||
977 | the attributes given to path `t/abc` are computed as follows: | |
978 | ||
979 | 1. By examining `t/.gitattributes` (which is in the same | |
2de9b711 | 980 | directory as the path in question), Git finds that the first |
88e7fdf2 JH |
981 | line matches. `merge` attribute is set. It also finds that |
982 | the second line matches, and attributes `foo` and `bar` | |
983 | are unset. | |
984 | ||
985 | 2. Then it examines `.gitattributes` (which is in the parent | |
986 | directory), and finds that the first line matches, but | |
987 | `t/.gitattributes` file already decided how `merge`, `foo` | |
988 | and `bar` attributes should be given to this path, so it | |
989 | leaves `foo` and `bar` unset. Attribute `baz` is set. | |
990 | ||
5c759f96 | 991 | 3. Finally it examines `$GIT_DIR/info/attributes`. This file |
88e7fdf2 JH |
992 | is used to override the in-tree settings. The first line is |
993 | a match, and `foo` is set, `bar` is reverted to unspecified | |
994 | state, and `baz` is unset. | |
995 | ||
02783075 | 996 | As the result, the attributes assignment to `t/abc` becomes: |
88e7fdf2 JH |
997 | |
998 | ---------------------------------------------------------------- | |
999 | foo set to true | |
1000 | bar unspecified | |
1001 | baz set to false | |
1002 | merge set to string value "filfre" | |
1003 | frotz unspecified | |
1004 | ---------------------------------------------------------------- | |
1005 | ||
1006 | ||
cde15181 MH |
1007 | SEE ALSO |
1008 | -------- | |
1009 | linkgit:git-check-attr[1]. | |
8460b2fc | 1010 | |
88e7fdf2 JH |
1011 | GIT |
1012 | --- | |
9e1f0a85 | 1013 | Part of the linkgit:git[1] suite |