]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/gitattributes.txt
Merge branch 'gc/branch-recurse-submodules-fix'
[thirdparty/git.git] / Documentation / gitattributes.txt
1 gitattributes(5)
2 ================
3
4 NAME
5 ----
6 gitattributes - Defining attributes per path
7
8 SYNOPSIS
9 --------
10 $GIT_DIR/info/attributes, .gitattributes
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
21 pattern attr1 attr2 ...
22
23 That is, a pattern followed by an attributes list,
24 separated by whitespaces. Leading and trailing whitespaces are
25 ignored. Lines that begin with '#' are ignored. Patterns
26 that begin with a double quote are quoted in C style.
27 When the pattern matches the path in question, the attributes
28 listed on the line are given to the path.
29
30 Each attribute can be in one of these states for a given path:
31
32 Set::
33
34 The path has the attribute with special value "true";
35 this is specified by listing only the name of the
36 attribute in the attribute list.
37
38 Unset::
39
40 The path has the attribute with special value "false";
41 this is specified by listing the name of the attribute
42 prefixed with a dash `-` in the attribute list.
43
44 Set to a value::
45
46 The path has the attribute with specified string value;
47 this is specified by listing the name of the attribute
48 followed by an equal sign `=` and its value in the
49 attribute list.
50
51 Unspecified::
52
53 No pattern matches the path, and nothing says if
54 the path has or does not have the attribute, the
55 attribute for the path is said to be Unspecified.
56
57 When more than one pattern matches the path, a later line
58 overrides an earlier line. This overriding is done per
59 attribute.
60
61 The rules by which the pattern matches paths are the same as in
62 `.gitignore` files (see linkgit:gitignore[5]), with a few exceptions:
63
64 - negative patterns are forbidden
65
66 - patterns that match a directory do not recursively match paths
67 inside that directory (so using the trailing-slash `path/` syntax is
68 pointless in an attributes file; use `path/**` instead)
69
70 When deciding what attributes are assigned to a path, Git
71 consults `$GIT_DIR/info/attributes` file (which has the highest
72 precedence), `.gitattributes` file in the same directory as the
73 path in question, and its parent directories up to the toplevel of the
74 work tree (the further the directory that contains `.gitattributes`
75 is from the path in question, the lower its precedence). Finally
76 global and system-wide files are considered (they have the lowest
77 precedence).
78
79 When the `.gitattributes` file is missing from the work tree, the
80 path in the index is used as a fall-back. During checkout process,
81 `.gitattributes` in the index is used and then the file in the
82 working tree is used as a fall-back.
83
84 If you wish to affect only a single repository (i.e., to assign
85 attributes to files that are particular to
86 one user's workflow for that repository), then
87 attributes should be placed in the `$GIT_DIR/info/attributes` file.
88 Attributes which should be version-controlled and distributed to other
89 repositories (i.e., attributes of interest to all users) should go into
90 `.gitattributes` files. Attributes that should affect all repositories
91 for a single user should be placed in a file specified by the
92 `core.attributesFile` configuration option (see linkgit:git-config[1]).
93 Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
94 is either not set or empty, $HOME/.config/git/attributes is used instead.
95 Attributes for all users on a system should be placed in the
96 `$(prefix)/etc/gitattributes` file.
97
98 Sometimes you would need to override a setting of an attribute
99 for a path to `Unspecified` state. This can be done by listing
100 the name of the attribute prefixed with an exclamation point `!`.
101
102
103 EFFECTS
104 -------
105
106 Certain operations by Git can be influenced by assigning
107 particular attributes to a path. Currently, the following
108 operations are attributes-aware.
109
110 Checking-out and checking-in
111 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112
113 These attributes affect how the contents stored in the
114 repository are copied to the working tree files when commands
115 such as 'git switch', 'git checkout' and 'git merge' run.
116 They also affect how
117 Git stores the contents you prepare in the working tree in the
118 repository upon 'git add' and 'git commit'.
119
120 `text`
121 ^^^^^^
122
123 This attribute enables and controls end-of-line normalization. When a
124 text file is normalized, its line endings are converted to LF in the
125 repository. To control what line ending style is used in the working
126 directory, use the `eol` attribute for a single file and the
127 `core.eol` configuration variable for all text files.
128 Note that setting `core.autocrlf` to `true` or `input` overrides
129 `core.eol` (see the definitions of those options in
130 linkgit:git-config[1]).
131
132 Set::
133
134 Setting the `text` attribute on a path enables end-of-line
135 normalization and marks the path as a text file. End-of-line
136 conversion takes place without guessing the content type.
137
138 Unset::
139
140 Unsetting the `text` attribute on a path tells Git not to
141 attempt any end-of-line conversion upon checkin or checkout.
142
143 Set to string value "auto"::
144
145 When `text` is set to "auto", the path is marked for automatic
146 end-of-line conversion. If Git decides that the content is
147 text, its line endings are converted to LF on checkin.
148 When the file has been committed with CRLF, no conversion is done.
149
150 Unspecified::
151
152 If the `text` attribute is unspecified, Git uses the
153 `core.autocrlf` configuration variable to determine if the
154 file should be converted.
155
156 Any other value causes Git to act as if `text` has been left
157 unspecified.
158
159 `eol`
160 ^^^^^
161
162 This attribute sets a specific line-ending style to be used in the
163 working directory. This attribute has effect only if the `text`
164 attribute is set or unspecified, or if it is set to `auto`, the file is
165 detected as text, and it is stored with LF endings in the index. Note
166 that setting this attribute on paths which are in the index with CRLF
167 line endings may make the paths to be considered dirty unless
168 `text=auto` is set. Adding the path to the index again will normalize
169 the line endings in the index.
170
171 Set to string value "crlf"::
172
173 This setting forces Git to normalize line endings for this
174 file on checkin and convert them to CRLF when the file is
175 checked out.
176
177 Set to string value "lf"::
178
179 This setting forces Git to normalize line endings to LF on
180 checkin and prevents conversion to CRLF when the file is
181 checked out.
182
183 Backwards compatibility with `crlf` attribute
184 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
185
186 For backwards compatibility, the `crlf` attribute is interpreted as
187 follows:
188
189 ------------------------
190 crlf text
191 -crlf -text
192 crlf=input eol=lf
193 ------------------------
194
195 End-of-line conversion
196 ^^^^^^^^^^^^^^^^^^^^^^
197
198 While Git normally leaves file contents alone, it can be configured to
199 normalize line endings to LF in the repository and, optionally, to
200 convert them to CRLF when files are checked out.
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
204 config variable "core.autocrlf" without using any attributes.
205
206 ------------------------
207 [core]
208 autocrlf = true
209 ------------------------
210
211 This does not force normalization of 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
214 already normalized in the repository stay normalized.
215
216 If you want to ensure that text files that any contributor introduces to
217 the repository have their line endings normalized, you can set the
218 `text` attribute to "auto" for _all_ files.
219
220 ------------------------
221 * text=auto
222 ------------------------
223
224 The attributes allow a fine-grained control, how the line endings
225 are converted.
226 Here is an example that will make Git normalize .txt, .vcproj and .sh
227 files, ensure that .vcproj files have CRLF and .sh files have LF in
228 the working directory, and prevent .jpg files from being normalized
229 regardless of their content.
230
231 ------------------------
232 * text=auto
233 *.txt text
234 *.vcproj text eol=crlf
235 *.sh text eol=lf
236 *.jpg -text
237 ------------------------
238
239 NOTE: When `text=auto` conversion is enabled in a cross-platform
240 project using push and pull to a central repository the text files
241 containing CRLFs should be normalized.
242
243 From a clean working directory:
244
245 -------------------------------------------------
246 $ echo "* text=auto" >.gitattributes
247 $ git add --renormalize .
248 $ git status # Show files that will be normalized
249 $ git commit -m "Introduce end-of-line normalization"
250 -------------------------------------------------
251
252 If any files that should not be normalized show up in 'git status',
253 unset their `text` attribute before running 'git add -u'.
254
255 ------------------------
256 manual.pdf -text
257 ------------------------
258
259 Conversely, text files that Git does not detect can have normalization
260 enabled manually.
261
262 ------------------------
263 weirdchars.txt text
264 ------------------------
265
266 If `core.safecrlf` is set to "true" or "warn", Git verifies if
267 the conversion is reversible for the current setting of
268 `core.autocrlf`. For "true", Git rejects irreversible
269 conversions; for "warn", Git only prints a warning but accepts
270 an irreversible conversion. The safety triggers to prevent such
271 a conversion done to the files in the work tree, but there are a
272 few exceptions. Even though...
273
274 - 'git add' itself does not touch the files in the work tree, the
275 next checkout would, so the safety triggers;
276
277 - 'git apply' to update a text file with a patch does touch the files
278 in the work tree, but the operation is about text files and CRLF
279 conversion is about fixing the line ending inconsistencies, so the
280 safety does not trigger;
281
282 - 'git diff' itself does not touch the files in the work tree, it is
283 often run to inspect the changes you intend to next 'git add'. To
284 catch potential problems early, safety triggers.
285
286
287 `working-tree-encoding`
288 ^^^^^^^^^^^^^^^^^^^^^^^
289
290 Git recognizes files encoded in ASCII or one of its supersets (e.g.
291 UTF-8, ISO-8859-1, ...) as text files. Files encoded in certain other
292 encodings (e.g. UTF-16) are interpreted as binary and consequently
293 built-in Git text processing tools (e.g. 'git diff') as well as most Git
294 web front ends do not visualize the contents of these files by default.
295
296 In these cases you can tell Git the encoding of a file in the working
297 directory with the `working-tree-encoding` attribute. If a file with this
298 attribute is added to Git, then Git re-encodes the content from the
299 specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
300 content in its internal data structure (called "the index"). On checkout
301 the content is re-encoded back to the specified encoding.
302
303 Please note that using the `working-tree-encoding` attribute may have a
304 number of pitfalls:
305
306 - Alternative Git implementations (e.g. JGit or libgit2) and older Git
307 versions (as of March 2018) do not support the `working-tree-encoding`
308 attribute. If you decide to use the `working-tree-encoding` attribute
309 in your repository, then it is strongly recommended to ensure that all
310 clients working with the repository support it.
311 +
312 For example, Microsoft Visual Studio resources files (`*.rc`) or
313 PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
314 If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
315 a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
316 stored as UTF-8 internally. A client without `working-tree-encoding`
317 support will checkout `foo.ps1` as UTF-8 encoded file. This will
318 typically cause trouble for the users of this file.
319 +
320 If a Git client that does not support the `working-tree-encoding`
321 attribute adds a new file `bar.ps1`, then `bar.ps1` will be
322 stored "as-is" internally (in this example probably as UTF-16).
323 A client with `working-tree-encoding` support will interpret the
324 internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
325 That operation will fail and cause an error.
326
327 - Reencoding content to non-UTF encodings can cause errors as the
328 conversion might not be UTF-8 round trip safe. If you suspect your
329 encoding to not be round trip safe, then add it to
330 `core.checkRoundtripEncoding` to make Git check the round trip
331 encoding (see linkgit:git-config[1]). SHIFT-JIS (Japanese character
332 set) is known to have round trip issues with UTF-8 and is checked by
333 default.
334
335 - Reencoding content requires resources that might slow down certain
336 Git operations (e.g 'git checkout' or 'git add').
337
338 Use the `working-tree-encoding` attribute only if you cannot store a file
339 in UTF-8 encoding and if you want Git to be able to process the content
340 as text.
341
342 As an example, use the following attributes if your '*.ps1' files are
343 UTF-16 encoded with byte order mark (BOM) and you want Git to perform
344 automatic line ending conversion based on your platform.
345
346 ------------------------
347 *.ps1 text working-tree-encoding=UTF-16
348 ------------------------
349
350 Use the following attributes if your '*.ps1' files are UTF-16 little
351 endian encoded without BOM and you want Git to use Windows line endings
352 in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
353 you want UTF-16 little endian with BOM).
354 Please note, it is highly recommended to
355 explicitly define the line endings with `eol` if the `working-tree-encoding`
356 attribute is used to avoid ambiguity.
357
358 ------------------------
359 *.ps1 text working-tree-encoding=UTF-16LE eol=CRLF
360 ------------------------
361
362 You can get a list of all available encodings on your platform with the
363 following command:
364
365 ------------------------
366 iconv --list
367 ------------------------
368
369 If you do not know the encoding of a file, then you can use the `file`
370 command to guess the encoding:
371
372 ------------------------
373 file foo.ps1
374 ------------------------
375
376
377 `ident`
378 ^^^^^^^
379
380 When the attribute `ident` is set for a path, Git replaces
381 `$Id$` in the blob object with `$Id:`, followed by the
382 40-character hexadecimal blob object name, followed by a dollar
383 sign `$` upon checkout. Any byte sequence that begins with
384 `$Id:` and ends with `$` in the worktree file is replaced
385 with `$Id$` upon check-in.
386
387
388 `filter`
389 ^^^^^^^^
390
391 A `filter` attribute can be set to a string value that names a
392 filter driver specified in the configuration.
393
394 A filter driver consists of a `clean` command and a `smudge`
395 command, either of which can be left unspecified. Upon
396 checkout, when the `smudge` command is specified, the command is
397 fed the blob object from its standard input, and its standard
398 output is used to update the worktree file. Similarly, the
399 `clean` command is used to convert the contents of worktree file
400 upon checkin. By default these commands process only a single
401 blob and terminate. If a long running `process` filter is used
402 in place of `clean` and/or `smudge` filters, then Git can process
403 all blobs with a single filter command invocation for the entire
404 life of a single Git command, for example `git add --all`. If a
405 long running `process` filter is configured then it always takes
406 precedence over a configured single blob filter. See section
407 below for the description of the protocol used to communicate with
408 a `process` filter.
409
410 One use of the content filtering is to massage the content into a shape
411 that is more convenient for the platform, filesystem, and the user to use.
412 For this mode of operation, the key phrase here is "more convenient" and
413 not "turning something unusable into usable". In other words, the intent
414 is that if someone unsets the filter driver definition, or does not have
415 the appropriate filter program, the project should still be usable.
416
417 Another use of the content filtering is to store the content that cannot
418 be directly used in the repository (e.g. a UUID that refers to the true
419 content stored outside Git, or an encrypted content) and turn it into a
420 usable form upon checkout (e.g. download the external content, or decrypt
421 the encrypted content).
422
423 These two filters behave differently, and by default, a filter is taken as
424 the former, massaging the contents into more convenient shape. A missing
425 filter driver definition in the config, or a filter driver that exits with
426 a non-zero status, is not an error but makes the filter a no-op passthru.
427
428 You can declare that a filter turns a content that by itself is unusable
429 into a usable content by setting the filter.<driver>.required configuration
430 variable to `true`.
431
432 Note: Whenever the clean filter is changed, the repo should be renormalized:
433 $ git add --renormalize .
434
435 For example, in .gitattributes, you would assign the `filter`
436 attribute for paths.
437
438 ------------------------
439 *.c filter=indent
440 ------------------------
441
442 Then you would define a "filter.indent.clean" and "filter.indent.smudge"
443 configuration in your .git/config to specify a pair of commands to
444 modify the contents of C programs when the source files are checked
445 in ("clean" is run) and checked out (no change is made because the
446 command is "cat").
447
448 ------------------------
449 [filter "indent"]
450 clean = indent
451 smudge = cat
452 ------------------------
453
454 For best results, `clean` should not alter its output further if it is
455 run twice ("clean->clean" should be equivalent to "clean"), and
456 multiple `smudge` commands should not alter `clean`'s output
457 ("smudge->smudge->clean" should be equivalent to "clean"). See the
458 section on merging below.
459
460 The "indent" filter is well-behaved in this regard: it will not modify
461 input that is already correctly indented. In this case, the lack of a
462 smudge filter means that the clean filter _must_ accept its own output
463 without modifying it.
464
465 If a filter _must_ succeed in order to make the stored contents usable,
466 you can declare that the filter is `required`, in the configuration:
467
468 ------------------------
469 [filter "crypt"]
470 clean = openssl enc ...
471 smudge = openssl enc -d ...
472 required
473 ------------------------
474
475 Sequence "%f" on the filter command line is replaced with the name of
476 the file the filter is working on. A filter might use this in keyword
477 substitution. For example:
478
479 ------------------------
480 [filter "p4"]
481 clean = git-p4-filter --clean %f
482 smudge = git-p4-filter --smudge %f
483 ------------------------
484
485 Note that "%f" is the name of the path that is being worked on. Depending
486 on the version that is being filtered, the corresponding file on disk may
487 not exist, or may have different contents. So, smudge and clean commands
488 should not try to access the file on disk, but only act as filters on the
489 content provided to them on standard input.
490
491 Long Running Filter Process
492 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
493
494 If the filter command (a string value) is defined via
495 `filter.<driver>.process` then Git can process all blobs with a
496 single filter invocation for the entire life of a single Git
497 command. This is achieved by using the long-running process protocol
498 (described in technical/long-running-process-protocol.txt).
499
500 When Git encounters the first file that needs to be cleaned or smudged,
501 it starts the filter and performs the handshake. In the handshake, the
502 welcome message sent by Git is "git-filter-client", only version 2 is
503 supported, and the supported capabilities are "clean", "smudge", and
504 "delay".
505
506 Afterwards Git sends a list of "key=value" pairs terminated with
507 a flush packet. The list will contain at least the filter command
508 (based on the supported capabilities) and the pathname of the file
509 to filter relative to the repository root. Right after the flush packet
510 Git sends the content split in zero or more pkt-line packets and a
511 flush packet to terminate content. Please note, that the filter
512 must not send any response before it received the content and the
513 final flush packet. Also note that the "value" of a "key=value" pair
514 can contain the "=" character whereas the key would never contain
515 that character.
516 ------------------------
517 packet: git> command=smudge
518 packet: git> pathname=path/testfile.dat
519 packet: git> 0000
520 packet: git> CONTENT
521 packet: git> 0000
522 ------------------------
523
524 The filter is expected to respond with a list of "key=value" pairs
525 terminated with a flush packet. If the filter does not experience
526 problems then the list must contain a "success" status. Right after
527 these packets the filter is expected to send the content in zero
528 or more pkt-line packets and a flush packet at the end. Finally, a
529 second list of "key=value" pairs terminated with a flush packet
530 is expected. The filter can change the status in the second list
531 or keep the status as is with an empty list. Please note that the
532 empty list must be terminated with a flush packet regardless.
533
534 ------------------------
535 packet: git< status=success
536 packet: git< 0000
537 packet: git< SMUDGED_CONTENT
538 packet: git< 0000
539 packet: git< 0000 # empty list, keep "status=success" unchanged!
540 ------------------------
541
542 If the result content is empty then the filter is expected to respond
543 with a "success" status and a flush packet to signal the empty content.
544 ------------------------
545 packet: git< status=success
546 packet: git< 0000
547 packet: git< 0000 # empty content!
548 packet: git< 0000 # empty list, keep "status=success" unchanged!
549 ------------------------
550
551 In case the filter cannot or does not want to process the content,
552 it is expected to respond with an "error" status.
553 ------------------------
554 packet: git< status=error
555 packet: git< 0000
556 ------------------------
557
558 If the filter experiences an error during processing, then it can
559 send the status "error" after the content was (partially or
560 completely) sent.
561 ------------------------
562 packet: git< status=success
563 packet: git< 0000
564 packet: git< HALF_WRITTEN_ERRONEOUS_CONTENT
565 packet: git< 0000
566 packet: git< status=error
567 packet: git< 0000
568 ------------------------
569
570 In case the filter cannot or does not want to process the content
571 as well as any future content for the lifetime of the Git process,
572 then it is expected to respond with an "abort" status at any point
573 in the protocol.
574 ------------------------
575 packet: git< status=abort
576 packet: git< 0000
577 ------------------------
578
579 Git neither stops nor restarts the filter process in case the
580 "error"/"abort" status is set. However, Git sets its exit code
581 according to the `filter.<driver>.required` flag, mimicking the
582 behavior of the `filter.<driver>.clean` / `filter.<driver>.smudge`
583 mechanism.
584
585 If the filter dies during the communication or does not adhere to
586 the protocol then Git will stop the filter process and restart it
587 with the next file that needs to be processed. Depending on the
588 `filter.<driver>.required` flag Git will interpret that as error.
589
590 Delay
591 ^^^^^
592
593 If the filter supports the "delay" capability, then Git can send the
594 flag "can-delay" after the filter command and pathname. This flag
595 denotes that the filter can delay filtering the current blob (e.g. to
596 compensate network latencies) by responding with no content but with
597 the status "delayed" and a flush packet.
598 ------------------------
599 packet: git> command=smudge
600 packet: git> pathname=path/testfile.dat
601 packet: git> can-delay=1
602 packet: git> 0000
603 packet: git> CONTENT
604 packet: git> 0000
605 packet: git< status=delayed
606 packet: git< 0000
607 ------------------------
608
609 If the filter supports the "delay" capability then it must support the
610 "list_available_blobs" command. If Git sends this command, then the
611 filter is expected to return a list of pathnames representing blobs
612 that have been delayed earlier and are now available.
613 The list must be terminated with a flush packet followed
614 by a "success" status that is also terminated with a flush packet. If
615 no blobs for the delayed paths are available, yet, then the filter is
616 expected to block the response until at least one blob becomes
617 available. The filter can tell Git that it has no more delayed blobs
618 by sending an empty list. As soon as the filter responds with an empty
619 list, Git stops asking. All blobs that Git has not received at this
620 point are considered missing and will result in an error.
621
622 ------------------------
623 packet: git> command=list_available_blobs
624 packet: git> 0000
625 packet: git< pathname=path/testfile.dat
626 packet: git< pathname=path/otherfile.dat
627 packet: git< 0000
628 packet: git< status=success
629 packet: git< 0000
630 ------------------------
631
632 After Git received the pathnames, it will request the corresponding
633 blobs again. These requests contain a pathname and an empty content
634 section. The filter is expected to respond with the smudged content
635 in the usual way as explained above.
636 ------------------------
637 packet: git> command=smudge
638 packet: git> pathname=path/testfile.dat
639 packet: git> 0000
640 packet: git> 0000 # empty content!
641 packet: git< status=success
642 packet: git< 0000
643 packet: git< SMUDGED_CONTENT
644 packet: git< 0000
645 packet: git< 0000 # empty list, keep "status=success" unchanged!
646 ------------------------
647
648 Example
649 ^^^^^^^
650
651 A long running filter demo implementation can be found in
652 `contrib/long-running-filter/example.pl` located in the Git
653 core repository. If you develop your own long running filter
654 process then the `GIT_TRACE_PACKET` environment variables can be
655 very helpful for debugging (see linkgit:git[1]).
656
657 Please note that you cannot use an existing `filter.<driver>.clean`
658 or `filter.<driver>.smudge` command with `filter.<driver>.process`
659 because the former two use a different inter process communication
660 protocol than the latter one.
661
662
663 Interaction between checkin/checkout attributes
664 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
665
666 In the check-in codepath, the worktree file is first converted
667 with `filter` driver (if specified and corresponding driver
668 defined), then the result is processed with `ident` (if
669 specified), and then finally with `text` (again, if specified
670 and applicable).
671
672 In the check-out codepath, the blob content is first converted
673 with `text`, and then `ident` and fed to `filter`.
674
675
676 Merging branches with differing checkin/checkout attributes
677 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
678
679 If you have added attributes to a file that cause the canonical
680 repository format for that file to change, such as adding a
681 clean/smudge filter or text/eol/ident attributes, merging anything
682 where the attribute is not in place would normally cause merge
683 conflicts.
684
685 To prevent these unnecessary merge conflicts, Git can be told to run a
686 virtual check-out and check-in of all three stages of a file when
687 resolving a three-way merge by setting the `merge.renormalize`
688 configuration variable. This prevents changes caused by check-in
689 conversion from causing spurious merge conflicts when a converted file
690 is merged with an unconverted file.
691
692 As long as a "smudge->clean" results in the same output as a "clean"
693 even on files that are already smudged, this strategy will
694 automatically resolve all filter-related conflicts. Filters that do
695 not act in this way may cause additional merge conflicts that must be
696 resolved manually.
697
698
699 Generating diff text
700 ~~~~~~~~~~~~~~~~~~~~
701
702 `diff`
703 ^^^^^^
704
705 The attribute `diff` affects how Git generates diffs for particular
706 files. It can tell Git whether to generate a textual patch for the path
707 or to treat the path as a binary file. It can also affect what line is
708 shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an
709 external command to generate the diff, or ask Git to convert binary
710 files to a text format before generating the diff.
711
712 Set::
713
714 A path to which the `diff` attribute is set is treated
715 as text, even when they contain byte values that
716 normally never appear in text files, such as NUL.
717
718 Unset::
719
720 A path to which the `diff` attribute is unset will
721 generate `Binary files differ` (or a binary patch, if
722 binary patches are enabled).
723
724 Unspecified::
725
726 A path to which the `diff` attribute is unspecified
727 first gets its contents inspected, and if it looks like
728 text and is smaller than core.bigFileThreshold, it is treated
729 as text. Otherwise it would generate `Binary files differ`.
730
731 String::
732
733 Diff is shown using the specified diff driver. Each driver may
734 specify one or more options, as described in the following
735 section. The options for the diff driver "foo" are defined
736 by the configuration variables in the "diff.foo" section of the
737 Git config file.
738
739
740 Defining an external diff driver
741 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
742
743 The definition of a diff driver is done in `gitconfig`, not
744 `gitattributes` file, so strictly speaking this manual page is a
745 wrong place to talk about it. However...
746
747 To define an external diff driver `jcdiff`, add a section to your
748 `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
749
750 ----------------------------------------------------------------
751 [diff "jcdiff"]
752 command = j-c-diff
753 ----------------------------------------------------------------
754
755 When Git needs to show you a diff for the path with `diff`
756 attribute set to `jcdiff`, it calls the command you specified
757 with the above configuration, i.e. `j-c-diff`, with 7
758 parameters, just like `GIT_EXTERNAL_DIFF` program is called.
759 See linkgit:git[1] for details.
760
761
762 Defining a custom hunk-header
763 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
764
765 Each group of changes (called a "hunk") in the textual diff output
766 is prefixed with a line of the form:
767
768 @@ -k,l +n,m @@ TEXT
769
770 This is called a 'hunk header'. The "TEXT" portion is by default a line
771 that begins with an alphabet, an underscore or a dollar sign; this
772 matches what GNU 'diff -p' output uses. This default selection however
773 is not suited for some contents, and you can use a customized pattern
774 to make a selection.
775
776 First, in .gitattributes, you would assign the `diff` attribute
777 for paths.
778
779 ------------------------
780 *.tex diff=tex
781 ------------------------
782
783 Then, you would define a "diff.tex.xfuncname" configuration to
784 specify a regular expression that matches a line that you would
785 want to appear as the hunk header "TEXT". Add a section to your
786 `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
787
788 ------------------------
789 [diff "tex"]
790 xfuncname = "^(\\\\(sub)*section\\{.*)$"
791 ------------------------
792
793 Note. A single level of backslashes are eaten by the
794 configuration file parser, so you would need to double the
795 backslashes; the pattern above picks a line that begins with a
796 backslash, and zero or more occurrences of `sub` followed by
797 `section` followed by open brace, to the end of line.
798
799 There are a few built-in patterns to make this easier, and `tex`
800 is one of them, so you do not have to write the above in your
801 configuration file (you still need to enable this with the
802 attribute mechanism, via `.gitattributes`). The following built in
803 patterns are available:
804
805 - `ada` suitable for source code in the Ada language.
806
807 - `bash` suitable for source code in the Bourne-Again SHell language.
808 Covers a superset of POSIX shell function definitions.
809
810 - `bibtex` suitable for files with BibTeX coded references.
811
812 - `cpp` suitable for source code in the C and C++ languages.
813
814 - `csharp` suitable for source code in the C# language.
815
816 - `css` suitable for cascading style sheets.
817
818 - `dts` suitable for devicetree (DTS) files.
819
820 - `elixir` suitable for source code in the Elixir language.
821
822 - `fortran` suitable for source code in the Fortran language.
823
824 - `fountain` suitable for Fountain documents.
825
826 - `golang` suitable for source code in the Go language.
827
828 - `html` suitable for HTML/XHTML documents.
829
830 - `java` suitable for source code in the Java language.
831
832 - `kotlin` suitable for source code in the Kotlin language.
833
834 - `markdown` suitable for Markdown documents.
835
836 - `matlab` suitable for source code in the MATLAB and Octave languages.
837
838 - `objc` suitable for source code in the Objective-C language.
839
840 - `pascal` suitable for source code in the Pascal/Delphi language.
841
842 - `perl` suitable for source code in the Perl language.
843
844 - `php` suitable for source code in the PHP language.
845
846 - `python` suitable for source code in the Python language.
847
848 - `ruby` suitable for source code in the Ruby language.
849
850 - `rust` suitable for source code in the Rust language.
851
852 - `scheme` suitable for source code in the Scheme language.
853
854 - `tex` suitable for source code for LaTeX documents.
855
856
857 Customizing word diff
858 ^^^^^^^^^^^^^^^^^^^^^
859
860 You can customize the rules that `git diff --word-diff` uses to
861 split words in a line, by specifying an appropriate regular expression
862 in the "diff.*.wordRegex" configuration variable. For example, in TeX
863 a backslash followed by a sequence of letters forms a command, but
864 several such commands can be run together without intervening
865 whitespace. To separate them, use a regular expression in your
866 `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
867
868 ------------------------
869 [diff "tex"]
870 wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
871 ------------------------
872
873 A built-in pattern is provided for all languages listed in the
874 previous section.
875
876
877 Performing text diffs of binary files
878 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
879
880 Sometimes it is desirable to see the diff of a text-converted
881 version of some binary files. For example, a word processor
882 document can be converted to an ASCII text representation, and
883 the diff of the text shown. Even though this conversion loses
884 some information, the resulting diff is useful for human
885 viewing (but cannot be applied directly).
886
887 The `textconv` config option is used to define a program for
888 performing such a conversion. The program should take a single
889 argument, the name of a file to convert, and produce the
890 resulting text on stdout.
891
892 For example, to show the diff of the exif information of a
893 file instead of the binary information (assuming you have the
894 exif tool installed), add the following section to your
895 `$GIT_DIR/config` file (or `$HOME/.gitconfig` file):
896
897 ------------------------
898 [diff "jpg"]
899 textconv = exif
900 ------------------------
901
902 NOTE: The text conversion is generally a one-way conversion;
903 in this example, we lose the actual image contents and focus
904 just on the text data. This means that diffs generated by
905 textconv are _not_ suitable for applying. For this reason,
906 only `git diff` and the `git log` family of commands (i.e.,
907 log, whatchanged, show) will perform text conversion. `git
908 format-patch` will never generate this output. If you want to
909 send somebody a text-converted diff of a binary file (e.g.,
910 because it quickly conveys the changes you have made), you
911 should generate it separately and send it as a comment _in
912 addition to_ the usual binary diff that you might send.
913
914 Because text conversion can be slow, especially when doing a
915 large number of them with `git log -p`, Git provides a mechanism
916 to cache the output and use it in future diffs. To enable
917 caching, set the "cachetextconv" variable in your diff driver's
918 config. For example:
919
920 ------------------------
921 [diff "jpg"]
922 textconv = exif
923 cachetextconv = true
924 ------------------------
925
926 This will cache the result of running "exif" on each blob
927 indefinitely. If you change the textconv config variable for a
928 diff driver, Git will automatically invalidate the cache entries
929 and re-run the textconv filter. If you want to invalidate the
930 cache manually (e.g., because your version of "exif" was updated
931 and now produces better output), you can remove the cache
932 manually with `git update-ref -d refs/notes/textconv/jpg` (where
933 "jpg" is the name of the diff driver, as in the example above).
934
935 Choosing textconv versus external diff
936 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
937
938 If you want to show differences between binary or specially-formatted
939 blobs in your repository, you can choose to use either an external diff
940 command, or to use textconv to convert them to a diff-able text format.
941 Which method you choose depends on your exact situation.
942
943 The advantage of using an external diff command is flexibility. You are
944 not bound to find line-oriented changes, nor is it necessary for the
945 output to resemble unified diff. You are free to locate and report
946 changes in the most appropriate way for your data format.
947
948 A textconv, by comparison, is much more limiting. You provide a
949 transformation of the data into a line-oriented text format, and Git
950 uses its regular diff tools to generate the output. There are several
951 advantages to choosing this method:
952
953 1. Ease of use. It is often much simpler to write a binary to text
954 transformation than it is to perform your own diff. In many cases,
955 existing programs can be used as textconv filters (e.g., exif,
956 odt2txt).
957
958 2. Git diff features. By performing only the transformation step
959 yourself, you can still utilize many of Git's diff features,
960 including colorization, word-diff, and combined diffs for merges.
961
962 3. Caching. Textconv caching can speed up repeated diffs, such as those
963 you might trigger by running `git log -p`.
964
965
966 Marking files as binary
967 ^^^^^^^^^^^^^^^^^^^^^^^
968
969 Git usually guesses correctly whether a blob contains text or binary
970 data by examining the beginning of the contents. However, sometimes you
971 may want to override its decision, either because a blob contains binary
972 data later in the file, or because the content, while technically
973 composed of text characters, is opaque to a human reader. For example,
974 many postscript files contain only ASCII characters, but produce noisy
975 and meaningless diffs.
976
977 The simplest way to mark a file as binary is to unset the diff
978 attribute in the `.gitattributes` file:
979
980 ------------------------
981 *.ps -diff
982 ------------------------
983
984 This will cause Git to generate `Binary files differ` (or a binary
985 patch, if binary patches are enabled) instead of a regular diff.
986
987 However, one may also want to specify other diff driver attributes. For
988 example, you might want to use `textconv` to convert postscript files to
989 an ASCII representation for human viewing, but otherwise treat them as
990 binary files. You cannot specify both `-diff` and `diff=ps` attributes.
991 The solution is to use the `diff.*.binary` config option:
992
993 ------------------------
994 [diff "ps"]
995 textconv = ps2ascii
996 binary = true
997 ------------------------
998
999 Performing a three-way merge
1000 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1001
1002 `merge`
1003 ^^^^^^^
1004
1005 The attribute `merge` affects how three versions of a file are
1006 merged when a file-level merge is necessary during `git merge`,
1007 and other commands such as `git revert` and `git cherry-pick`.
1008
1009 Set::
1010
1011 Built-in 3-way merge driver is used to merge the
1012 contents in a way similar to 'merge' command of `RCS`
1013 suite. This is suitable for ordinary text files.
1014
1015 Unset::
1016
1017 Take the version from the current branch as the
1018 tentative merge result, and declare that the merge has
1019 conflicts. This is suitable for binary files that do
1020 not have a well-defined merge semantics.
1021
1022 Unspecified::
1023
1024 By default, this uses the same built-in 3-way merge
1025 driver as is the case when the `merge` attribute is set.
1026 However, the `merge.default` configuration variable can name
1027 different merge driver to be used with paths for which the
1028 `merge` attribute is unspecified.
1029
1030 String::
1031
1032 3-way merge is performed using the specified custom
1033 merge driver. The built-in 3-way merge driver can be
1034 explicitly specified by asking for "text" driver; the
1035 built-in "take the current branch" driver can be
1036 requested with "binary".
1037
1038
1039 Built-in merge drivers
1040 ^^^^^^^^^^^^^^^^^^^^^^
1041
1042 There are a few built-in low-level merge drivers defined that
1043 can be asked for via the `merge` attribute.
1044
1045 text::
1046
1047 Usual 3-way file level merge for text files. Conflicted
1048 regions are marked with conflict markers `<<<<<<<`,
1049 `=======` and `>>>>>>>`. The version from your branch
1050 appears before the `=======` marker, and the version
1051 from the merged branch appears after the `=======`
1052 marker.
1053
1054 binary::
1055
1056 Keep the version from your branch in the work tree, but
1057 leave the path in the conflicted state for the user to
1058 sort out.
1059
1060 union::
1061
1062 Run 3-way file level merge for text files, but take
1063 lines from both versions, instead of leaving conflict
1064 markers. This tends to leave the added lines in the
1065 resulting file in random order and the user should
1066 verify the result. Do not use this if you do not
1067 understand the implications.
1068
1069
1070 Defining a custom merge driver
1071 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1072
1073 The definition of a merge driver is done in the `.git/config`
1074 file, not in the `gitattributes` file, so strictly speaking this
1075 manual page is a wrong place to talk about it. However...
1076
1077 To define a custom merge driver `filfre`, add a section to your
1078 `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
1079
1080 ----------------------------------------------------------------
1081 [merge "filfre"]
1082 name = feel-free merge driver
1083 driver = filfre %O %A %B %L %P
1084 recursive = binary
1085 ----------------------------------------------------------------
1086
1087 The `merge.*.name` variable gives the driver a human-readable
1088 name.
1089
1090 The `merge.*.driver` variable's value is used to construct a
1091 command to run to merge ancestor's version (`%O`), current
1092 version (`%A`) and the other branches' version (`%B`). These
1093 three tokens are replaced with the names of temporary files that
1094 hold the contents of these versions when the command line is
1095 built. Additionally, %L will be replaced with the conflict marker
1096 size (see below).
1097
1098 The merge driver is expected to leave the result of the merge in
1099 the file named with `%A` by overwriting it, and exit with zero
1100 status if it managed to merge them cleanly, or non-zero if there
1101 were conflicts.
1102
1103 The `merge.*.recursive` variable specifies what other merge
1104 driver to use when the merge driver is called for an internal
1105 merge between common ancestors, when there are more than one.
1106 When left unspecified, the driver itself is used for both
1107 internal merge and the final merge.
1108
1109 The merge driver can learn the pathname in which the merged result
1110 will be stored via placeholder `%P`.
1111
1112
1113 `conflict-marker-size`
1114 ^^^^^^^^^^^^^^^^^^^^^^
1115
1116 This attribute controls the length of conflict markers left in
1117 the work tree file during a conflicted merge. Only setting to
1118 the value to a positive integer has any meaningful effect.
1119
1120 For example, this line in `.gitattributes` can be used to tell the merge
1121 machinery to leave much longer (instead of the usual 7-character-long)
1122 conflict markers when merging the file `Documentation/git-merge.txt`
1123 results in a conflict.
1124
1125 ------------------------
1126 Documentation/git-merge.txt conflict-marker-size=32
1127 ------------------------
1128
1129
1130 Checking whitespace errors
1131 ~~~~~~~~~~~~~~~~~~~~~~~~~~
1132
1133 `whitespace`
1134 ^^^^^^^^^^^^
1135
1136 The `core.whitespace` configuration variable allows you to define what
1137 'diff' and 'apply' should consider whitespace errors for all paths in
1138 the project (See linkgit:git-config[1]). This attribute gives you finer
1139 control per path.
1140
1141 Set::
1142
1143 Notice all types of potential whitespace errors known to Git.
1144 The tab width is taken from the value of the `core.whitespace`
1145 configuration variable.
1146
1147 Unset::
1148
1149 Do not notice anything as error.
1150
1151 Unspecified::
1152
1153 Use the value of the `core.whitespace` configuration variable to
1154 decide what to notice as error.
1155
1156 String::
1157
1158 Specify a comma separate list of common whitespace problems to
1159 notice in the same format as the `core.whitespace` configuration
1160 variable.
1161
1162
1163 Creating an archive
1164 ~~~~~~~~~~~~~~~~~~~
1165
1166 `export-ignore`
1167 ^^^^^^^^^^^^^^^
1168
1169 Files and directories with the attribute `export-ignore` won't be added to
1170 archive files.
1171
1172 `export-subst`
1173 ^^^^^^^^^^^^^^
1174
1175 If the attribute `export-subst` is set for a file then Git will expand
1176 several placeholders when adding this file to an archive. The
1177 expansion depends on the availability of a commit ID, i.e., if
1178 linkgit:git-archive[1] has been given a tree instead of a commit or a
1179 tag then no replacement will be done. The placeholders are the same
1180 as those for the option `--pretty=format:` of linkgit:git-log[1],
1181 except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
1182 in the file. E.g. the string `$Format:%H$` will be replaced by the
1183 commit hash. However, only one `%(describe)` placeholder is expanded
1184 per archive to avoid denial-of-service attacks.
1185
1186
1187 Packing objects
1188 ~~~~~~~~~~~~~~~
1189
1190 `delta`
1191 ^^^^^^^
1192
1193 Delta compression will not be attempted for blobs for paths with the
1194 attribute `delta` set to false.
1195
1196
1197 Viewing files in GUI tools
1198 ~~~~~~~~~~~~~~~~~~~~~~~~~~
1199
1200 `encoding`
1201 ^^^^^^^^^^
1202
1203 The value of this attribute specifies the character encoding that should
1204 be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to
1205 display the contents of the relevant file. Note that due to performance
1206 considerations linkgit:gitk[1] does not use this attribute unless you
1207 manually enable per-file encodings in its options.
1208
1209 If this attribute is not set or has an invalid value, the value of the
1210 `gui.encoding` configuration variable is used instead
1211 (See linkgit:git-config[1]).
1212
1213
1214 USING MACRO ATTRIBUTES
1215 ----------------------
1216
1217 You do not want any end-of-line conversions applied to, nor textual diffs
1218 produced for, any binary file you track. You would need to specify e.g.
1219
1220 ------------
1221 *.jpg -text -diff
1222 ------------
1223
1224 but that may become cumbersome, when you have many attributes. Using
1225 macro attributes, you can define an attribute that, when set, also
1226 sets or unsets a number of other attributes at the same time. The
1227 system knows a built-in macro attribute, `binary`:
1228
1229 ------------
1230 *.jpg binary
1231 ------------
1232
1233 Setting the "binary" attribute also unsets the "text" and "diff"
1234 attributes as above. Note that macro attributes can only be "Set",
1235 though setting one might have the effect of setting or unsetting other
1236 attributes or even returning other attributes to the "Unspecified"
1237 state.
1238
1239
1240 DEFINING MACRO ATTRIBUTES
1241 -------------------------
1242
1243 Custom macro attributes can be defined only in top-level gitattributes
1244 files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
1245 top level of the working tree, or the global or system-wide
1246 gitattributes files), not in `.gitattributes` files in working tree
1247 subdirectories. The built-in macro attribute "binary" is equivalent
1248 to:
1249
1250 ------------
1251 [attr]binary -diff -merge -text
1252 ------------
1253
1254 NOTES
1255 -----
1256
1257 Git does not follow symbolic links when accessing a `.gitattributes`
1258 file in the working tree. This keeps behavior consistent when the file
1259 is accessed from the index or a tree versus from the filesystem.
1260
1261 EXAMPLES
1262 --------
1263
1264 If you have these three `gitattributes` file:
1265
1266 ----------------------------------------------------------------
1267 (in $GIT_DIR/info/attributes)
1268
1269 a* foo !bar -baz
1270
1271 (in .gitattributes)
1272 abc foo bar baz
1273
1274 (in t/.gitattributes)
1275 ab* merge=filfre
1276 abc -foo -bar
1277 *.c frotz
1278 ----------------------------------------------------------------
1279
1280 the attributes given to path `t/abc` are computed as follows:
1281
1282 1. By examining `t/.gitattributes` (which is in the same
1283 directory as the path in question), Git finds that the first
1284 line matches. `merge` attribute is set. It also finds that
1285 the second line matches, and attributes `foo` and `bar`
1286 are unset.
1287
1288 2. Then it examines `.gitattributes` (which is in the parent
1289 directory), and finds that the first line matches, but
1290 `t/.gitattributes` file already decided how `merge`, `foo`
1291 and `bar` attributes should be given to this path, so it
1292 leaves `foo` and `bar` unset. Attribute `baz` is set.
1293
1294 3. Finally it examines `$GIT_DIR/info/attributes`. This file
1295 is used to override the in-tree settings. The first line is
1296 a match, and `foo` is set, `bar` is reverted to unspecified
1297 state, and `baz` is unset.
1298
1299 As the result, the attributes assignment to `t/abc` becomes:
1300
1301 ----------------------------------------------------------------
1302 foo set to true
1303 bar unspecified
1304 baz set to false
1305 merge set to string value "filfre"
1306 frotz unspecified
1307 ----------------------------------------------------------------
1308
1309
1310 SEE ALSO
1311 --------
1312 linkgit:git-check-attr[1].
1313
1314 GIT
1315 ---
1316 Part of the linkgit:git[1] suite