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