1gitattributes(5) 2================ 3 4NAME 5---- 6gitattributes - Defining attributes per path 7 8SYNOPSIS 9-------- 10$GIT_DIR/info/attributes, .gitattributes 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 21 pattern attr1 attr2 ... 22 23That is, a pattern followed by an attributes list, 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. 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 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 57When more than one pattern matches the path, a later line 58overrides an earlier line. This overriding is done per 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) 69 70When deciding what attributes are assigned to a path, Git 71consults `$GIT_DIR/info/attributes` file (which has the highest 72precedence), `.gitattributes` file in the same directory as the 73path in question, and its parent directories up to the toplevel of the 74work tree (the further the directory that contains `.gitattributes` 75is from the path in question, the lower its precedence). Finally 76global and system-wide files are considered (they have the lowest 77precedence). 78 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 84If you wish to affect only a single repository (i.e., to assign 85attributes to files that are particular to 86one user's workflow for that repository), then 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 90`.gitattributes` files. Attributes that should affect all repositories 91for a single user should be placed in a file specified by the 92`core.attributesFile` configuration option (see linkgit:git-config[1]). 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. 95Attributes for all users on a system should be placed in the 96`$(prefix)/etc/gitattributes` file. 97 98Sometimes you would need to override a setting of an attribute 99for a path to `Unspecified` state. This can be done by listing 100the name of the attribute prefixed with an exclamation point `!`. 101 102 103EFFECTS 104------- 105 106Certain operations by Git can be influenced by assigning 107particular attributes to a path. Currently, the following 108operations are attributes-aware. 109 110Checking-out and checking-in 111~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 112 113These attributes affect how the contents stored in the 114repository are copied to the working tree files when commands 115such as 'git switch', 'git checkout' and 'git merge' run. 116They also affect how 117Git stores the contents you prepare in the working tree in the 118repository upon 'git add' and 'git commit'. 119 120`text` 121^^^^^^ 122 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 127`core.eol` configuration variable for all text files. 128Note that setting `core.autocrlf` to `true` or `input` overrides 129`core.eol` (see the definitions of those options in 130linkgit:git-config[1]). 131 132Set:: 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 138Unset:: 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 143Set 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 150Unspecified:: 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 156Any other value causes Git to act as if `text` has been left 157unspecified. 158 159`eol` 160^^^^^ 161 162This attribute sets a specific line-ending style to be used in the 163working directory. It enables end-of-line conversion without any 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. 168 169Set to string value "crlf":: 170 171 This setting forces Git to normalize line endings for this 172 file on checkin and convert them to CRLF when the file is 173 checked out. 174 175Set to string value "lf":: 176 177 This setting forces Git to normalize line endings to LF on 178 checkin and prevents conversion to CRLF when the file is 179 checked out. 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------------------------ 192 193End-of-line conversion 194^^^^^^^^^^^^^^^^^^^^^^ 195 196While Git normally leaves file contents alone, it can be configured to 197normalize line endings to LF in the repository and, optionally, to 198convert them to CRLF when files are checked out. 199 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 202config variable "core.autocrlf" without using any attributes. 203 204------------------------ 205[core] 206 autocrlf = true 207------------------------ 208 209This does not force normalization of text files, but does ensure 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 212already normalized in the repository stay normalized. 213 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. 217 218------------------------ 219* text=auto 220------------------------ 221 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. 240 241From a clean working directory: 242 243------------------------------------------------- 244$ echo "* text=auto" >.gitattributes 245$ git add --renormalize . 246$ git status # Show files that will be normalized 247$ git commit -m "Introduce end-of-line normalization" 248------------------------------------------------- 249 250If any files that should not be normalized show up in 'git status', 251unset their `text` attribute before running 'git add -u'. 252 253------------------------ 254manual.pdf -text 255------------------------ 256 257Conversely, text files that Git does not detect can have normalization 258enabled manually. 259 260------------------------ 261weirdchars.txt text 262------------------------ 263 264If `core.safecrlf` is set to "true" or "warn", Git verifies if 265the conversion is reversible for the current setting of 266`core.autocrlf`. For "true", Git rejects irreversible 267conversions; for "warn", Git only prints a warning but accepts 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 272- 'git add' itself does not touch the files in the work tree, the 273 next checkout would, so the safety triggers; 274 275- 'git apply' to update a text file with a patch does touch the files 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 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 282 catch potential problems early, safety triggers. 283 284 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. 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+ 318If a Git client that does not support the `working-tree-encoding` 319attribute adds a new file `bar.ps1`, then `bar.ps1` will be 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. 324 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 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 350in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if 351you want UTF-16 little endian with BOM). 352Please note, it is highly recommended to 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 375`ident` 376^^^^^^^ 377 378When the attribute `ident` is set for a path, Git replaces 379`$Id$` in the blob object with `$Id:`, followed by the 38040-character hexadecimal blob object name, followed by a dollar 381sign `$` upon checkout. Any byte sequence that begins with 382`$Id:` and ends with `$` in the worktree file is replaced 383with `$Id$` upon check-in. 384 385 386`filter` 387^^^^^^^^ 388 389A `filter` attribute can be set to a string value that names a 390filter driver specified in the configuration. 391 392A filter driver consists of a `clean` command and a `smudge` 393command, either of which can be left unspecified. Upon 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 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. 407 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 417content stored outside Git, or an encrypted content) and turn it into a 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`. 429 430Note: Whenever the clean filter is changed, the repo should be renormalized: 431$ git add --renormalize . 432 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 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 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 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 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. 488 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 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". 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 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. 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 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 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 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 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 667specified), and then finally with `text` (again, if specified 668and applicable). 669 670In the check-out codepath, the blob content is first converted 671with `text`, and then `ident` and fed to `filter`. 672 673 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 683To prevent these unnecessary merge conflicts, Git can be told to run a 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 697Generating diff text 698~~~~~~~~~~~~~~~~~~~~ 699 700`diff` 701^^^^^^ 702 703The attribute `diff` affects how Git generates diffs for particular 704files. It can tell Git whether to generate a textual patch for the path 705or to treat the path as a binary file. It can also affect what line is 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 708files to a text format before generating the diff. 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 719 generate `Binary files differ` (or a binary patch, if 720 binary patches are enabled). 721 722Unspecified:: 723 724 A path to which the `diff` attribute is unspecified 725 first gets its contents inspected, and if it looks like 726 text and is smaller than core.bigFileThreshold, it is treated 727 as text. Otherwise it would generate `Binary files differ`. 728 729String:: 730 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 735 Git config file. 736 737 738Defining an external diff driver 739^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 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 745To define an external diff driver `jcdiff`, add a section to your 746`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 747 748---------------------------------------------------------------- 749[diff "jcdiff"] 750 command = j-c-diff 751---------------------------------------------------------------- 752 753When Git needs to show you a diff for the path with `diff` 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. 757See linkgit:git[1] for details. 758 759 760Defining a custom hunk-header 761^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 762 763Each group of changes (called a "hunk") in the textual diff output 764is prefixed with a line of the form: 765 766 @@ -k,l +n,m @@ TEXT 767 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. 773 774First, in .gitattributes, you would assign the `diff` attribute 775for paths. 776 777------------------------ 778*.tex diff=tex 779------------------------ 780 781Then, you would define a "diff.tex.xfuncname" configuration to 782specify a regular expression that matches a line that you would 783want to appear as the hunk header "TEXT". Add a section to your 784`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 785 786------------------------ 787[diff "tex"] 788 xfuncname = "^(\\\\(sub)*section\\{.*)$" 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 794backslash, and zero or more occurrences of `sub` followed by 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 800attribute mechanism, via `.gitattributes`). The following built in 801patterns are available: 802 803- `ada` suitable for source code in the Ada language. 804 805- `bibtex` suitable for files with BibTeX coded references. 806 807- `cpp` suitable for source code in the C and C++ languages. 808 809- `csharp` suitable for source code in the C# language. 810 811- `css` suitable for cascading style sheets. 812 813- `fortran` suitable for source code in the Fortran language. 814 815- `fountain` suitable for Fountain documents. 816 817- `golang` suitable for source code in the Go language. 818 819- `html` suitable for HTML/XHTML documents. 820 821- `java` suitable for source code in the Java language. 822 823- `matlab` suitable for source code in the MATLAB and Octave languages. 824 825- `objc` suitable for source code in the Objective-C language. 826 827- `pascal` suitable for source code in the Pascal/Delphi language. 828 829- `perl` suitable for source code in the Perl language. 830 831- `php` suitable for source code in the PHP language. 832 833- `python` suitable for source code in the Python language. 834 835- `ruby` suitable for source code in the Ruby language. 836 837- `rust` suitable for source code in the Rust language. 838 839- `tex` suitable for source code for LaTeX documents. 840 841 842Customizing word diff 843^^^^^^^^^^^^^^^^^^^^^ 844 845You can customize the rules that `git diff --word-diff` uses to 846split words in a line, by specifying an appropriate regular expression 847in the "diff.*.wordRegex" configuration variable. For example, in TeX 848a backslash followed by a sequence of letters forms a command, but 849several such commands can be run together without intervening 850whitespace. To separate them, use a regular expression in your 851`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 852 853------------------------ 854[diff "tex"] 855 wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" 856------------------------ 857 858A built-in pattern is provided for all languages listed in the 859previous section. 860 861 862Performing text diffs of binary files 863^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 864 865Sometimes it is desirable to see the diff of a text-converted 866version of some binary files. For example, a word processor 867document can be converted to an ASCII text representation, and 868the diff of the text shown. Even though this conversion loses 869some information, the resulting diff is useful for human 870viewing (but cannot be applied directly). 871 872The `textconv` config option is used to define a program for 873performing such a conversion. The program should take a single 874argument, the name of a file to convert, and produce the 875resulting text on stdout. 876 877For example, to show the diff of the exif information of a 878file instead of the binary information (assuming you have the 879exif tool installed), add the following section to your 880`$GIT_DIR/config` file (or `$HOME/.gitconfig` file): 881 882------------------------ 883[diff "jpg"] 884 textconv = exif 885------------------------ 886 887NOTE: The text conversion is generally a one-way conversion; 888in this example, we lose the actual image contents and focus 889just on the text data. This means that diffs generated by 890textconv are _not_ suitable for applying. For this reason, 891only `git diff` and the `git log` family of commands (i.e., 892log, whatchanged, show) will perform text conversion. `git 893format-patch` will never generate this output. If you want to 894send somebody a text-converted diff of a binary file (e.g., 895because it quickly conveys the changes you have made), you 896should generate it separately and send it as a comment _in 897addition to_ the usual binary diff that you might send. 898 899Because text conversion can be slow, especially when doing a 900large number of them with `git log -p`, Git provides a mechanism 901to cache the output and use it in future diffs. To enable 902caching, set the "cachetextconv" variable in your diff driver's 903config. For example: 904 905------------------------ 906[diff "jpg"] 907 textconv = exif 908 cachetextconv = true 909------------------------ 910 911This will cache the result of running "exif" on each blob 912indefinitely. If you change the textconv config variable for a 913diff driver, Git will automatically invalidate the cache entries 914and re-run the textconv filter. If you want to invalidate the 915cache manually (e.g., because your version of "exif" was updated 916and now produces better output), you can remove the cache 917manually with `git update-ref -d refs/notes/textconv/jpg` (where 918"jpg" is the name of the diff driver, as in the example above). 919 920Choosing textconv versus external diff 921^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 922 923If you want to show differences between binary or specially-formatted 924blobs in your repository, you can choose to use either an external diff 925command, or to use textconv to convert them to a diff-able text format. 926Which method you choose depends on your exact situation. 927 928The advantage of using an external diff command is flexibility. You are 929not bound to find line-oriented changes, nor is it necessary for the 930output to resemble unified diff. You are free to locate and report 931changes in the most appropriate way for your data format. 932 933A textconv, by comparison, is much more limiting. You provide a 934transformation of the data into a line-oriented text format, and Git 935uses its regular diff tools to generate the output. There are several 936advantages to choosing this method: 937 9381. Ease of use. It is often much simpler to write a binary to text 939 transformation than it is to perform your own diff. In many cases, 940 existing programs can be used as textconv filters (e.g., exif, 941 odt2txt). 942 9432. Git diff features. By performing only the transformation step 944 yourself, you can still utilize many of Git's diff features, 945 including colorization, word-diff, and combined diffs for merges. 946 9473. Caching. Textconv caching can speed up repeated diffs, such as those 948 you might trigger by running `git log -p`. 949 950 951Marking files as binary 952^^^^^^^^^^^^^^^^^^^^^^^ 953 954Git usually guesses correctly whether a blob contains text or binary 955data by examining the beginning of the contents. However, sometimes you 956may want to override its decision, either because a blob contains binary 957data later in the file, or because the content, while technically 958composed of text characters, is opaque to a human reader. For example, 959many postscript files contain only ASCII characters, but produce noisy 960and meaningless diffs. 961 962The simplest way to mark a file as binary is to unset the diff 963attribute in the `.gitattributes` file: 964 965------------------------ 966*.ps -diff 967------------------------ 968 969This will cause Git to generate `Binary files differ` (or a binary 970patch, if binary patches are enabled) instead of a regular diff. 971 972However, one may also want to specify other diff driver attributes. For 973example, you might want to use `textconv` to convert postscript files to 974an ASCII representation for human viewing, but otherwise treat them as 975binary files. You cannot specify both `-diff` and `diff=ps` attributes. 976The solution is to use the `diff.*.binary` config option: 977 978------------------------ 979[diff "ps"] 980 textconv = ps2ascii 981 binary = true 982------------------------ 983 984Performing a three-way merge 985~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 986 987`merge` 988^^^^^^^ 989 990The attribute `merge` affects how three versions of a file are 991merged when a file-level merge is necessary during `git merge`, 992and other commands such as `git revert` and `git cherry-pick`. 993 994Set:: 995 996 Built-in 3-way merge driver is used to merge the 997 contents in a way similar to 'merge' command of `RCS` 998 suite. This is suitable for ordinary text files. 9991000Unset::10011002 Take the version from the current branch as the1003 tentative merge result, and declare that the merge has1004 conflicts. This is suitable for binary files that do1005 not have a well-defined merge semantics.10061007Unspecified::10081009 By default, this uses the same built-in 3-way merge1010 driver as is the case when the `merge` attribute is set.1011 However, the `merge.default` configuration variable can name1012 different merge driver to be used with paths for which the1013 `merge` attribute is unspecified.10141015String::10161017 3-way merge is performed using the specified custom1018 merge driver. The built-in 3-way merge driver can be1019 explicitly specified by asking for "text" driver; the1020 built-in "take the current branch" driver can be1021 requested with "binary".102210231024Built-in merge drivers1025^^^^^^^^^^^^^^^^^^^^^^10261027There are a few built-in low-level merge drivers defined that1028can be asked for via the `merge` attribute.10291030text::10311032 Usual 3-way file level merge for text files. Conflicted1033 regions are marked with conflict markers `<<<<<<<`,1034 `=======` and `>>>>>>>`. The version from your branch1035 appears before the `=======` marker, and the version1036 from the merged branch appears after the `=======`1037 marker.10381039binary::10401041 Keep the version from your branch in the work tree, but1042 leave the path in the conflicted state for the user to1043 sort out.10441045union::10461047 Run 3-way file level merge for text files, but take1048 lines from both versions, instead of leaving conflict1049 markers. This tends to leave the added lines in the1050 resulting file in random order and the user should1051 verify the result. Do not use this if you do not1052 understand the implications.105310541055Defining a custom merge driver1056^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^10571058The definition of a merge driver is done in the `.git/config`1059file, not in the `gitattributes` file, so strictly speaking this1060manual page is a wrong place to talk about it. However...10611062To define a custom merge driver `filfre`, add a section to your1063`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:10641065----------------------------------------------------------------1066[merge "filfre"]1067 name = feel-free merge driver1068 driver = filfre %O %A %B %L %P1069 recursive = binary1070----------------------------------------------------------------10711072The `merge.*.name` variable gives the driver a human-readable1073name.10741075The `merge.*.driver` variable's value is used to construct a1076command to run to merge ancestor's version (`%O`), current1077version (`%A`) and the other branches' version (`%B`). These1078three tokens are replaced with the names of temporary files that1079hold the contents of these versions when the command line is1080built. Additionally, %L will be replaced with the conflict marker1081size (see below).10821083The merge driver is expected to leave the result of the merge in1084the file named with `%A` by overwriting it, and exit with zero1085status if it managed to merge them cleanly, or non-zero if there1086were conflicts.10871088The `merge.*.recursive` variable specifies what other merge1089driver to use when the merge driver is called for an internal1090merge between common ancestors, when there are more than one.1091When left unspecified, the driver itself is used for both1092internal merge and the final merge.10931094The merge driver can learn the pathname in which the merged result1095will be stored via placeholder `%P`.109610971098`conflict-marker-size`1099^^^^^^^^^^^^^^^^^^^^^^11001101This attribute controls the length of conflict markers left in1102the work tree file during a conflicted merge. Only setting to1103the value to a positive integer has any meaningful effect.11041105For example, this line in `.gitattributes` can be used to tell the merge1106machinery to leave much longer (instead of the usual 7-character-long)1107conflict markers when merging the file `Documentation/git-merge.txt`1108results in a conflict.11091110------------------------1111Documentation/git-merge.txt conflict-marker-size=321112------------------------111311141115Checking whitespace errors1116~~~~~~~~~~~~~~~~~~~~~~~~~~11171118`whitespace`1119^^^^^^^^^^^^11201121The `core.whitespace` configuration variable allows you to define what1122'diff' and 'apply' should consider whitespace errors for all paths in1123the project (See linkgit:git-config[1]). This attribute gives you finer1124control per path.11251126Set::11271128 Notice all types of potential whitespace errors known to Git.1129 The tab width is taken from the value of the `core.whitespace`1130 configuration variable.11311132Unset::11331134 Do not notice anything as error.11351136Unspecified::11371138 Use the value of the `core.whitespace` configuration variable to1139 decide what to notice as error.11401141String::11421143 Specify a comma separate list of common whitespace problems to1144 notice in the same format as the `core.whitespace` configuration1145 variable.114611471148Creating an archive1149~~~~~~~~~~~~~~~~~~~11501151`export-ignore`1152^^^^^^^^^^^^^^^11531154Files and directories with the attribute `export-ignore` won't be added to1155archive files.11561157`export-subst`1158^^^^^^^^^^^^^^11591160If the attribute `export-subst` is set for a file then Git will expand1161several placeholders when adding this file to an archive. The1162expansion depends on the availability of a commit ID, i.e., if1163linkgit:git-archive[1] has been given a tree instead of a commit or a1164tag then no replacement will be done. The placeholders are the same1165as those for the option `--pretty=format:` of linkgit:git-log[1],1166except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`1167in the file. E.g. the string `$Format:%H$` will be replaced by the1168commit hash.116911701171Packing objects1172~~~~~~~~~~~~~~~11731174`delta`1175^^^^^^^11761177Delta compression will not be attempted for blobs for paths with the1178attribute `delta` set to false.117911801181Viewing files in GUI tools1182~~~~~~~~~~~~~~~~~~~~~~~~~~11831184`encoding`1185^^^^^^^^^^11861187The value of this attribute specifies the character encoding that should1188be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to1189display the contents of the relevant file. Note that due to performance1190considerations linkgit:gitk[1] does not use this attribute unless you1191manually enable per-file encodings in its options.11921193If this attribute is not set or has an invalid value, the value of the1194`gui.encoding` configuration variable is used instead1195(See linkgit:git-config[1]).119611971198USING MACRO ATTRIBUTES1199----------------------12001201You do not want any end-of-line conversions applied to, nor textual diffs1202produced for, any binary file you track. You would need to specify e.g.12031204------------1205*.jpg -text -diff1206------------12071208but that may become cumbersome, when you have many attributes. Using1209macro attributes, you can define an attribute that, when set, also1210sets or unsets a number of other attributes at the same time. The1211system knows a built-in macro attribute, `binary`:12121213------------1214*.jpg binary1215------------12161217Setting the "binary" attribute also unsets the "text" and "diff"1218attributes as above. Note that macro attributes can only be "Set",1219though setting one might have the effect of setting or unsetting other1220attributes or even returning other attributes to the "Unspecified"1221state.122212231224DEFINING MACRO ATTRIBUTES1225-------------------------12261227Custom macro attributes can be defined only in top-level gitattributes1228files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the1229top level of the working tree, or the global or system-wide1230gitattributes files), not in `.gitattributes` files in working tree1231subdirectories. The built-in macro attribute "binary" is equivalent1232to:12331234------------1235[attr]binary -diff -merge -text1236------------123712381239EXAMPLES1240--------12411242If you have these three `gitattributes` file:12431244----------------------------------------------------------------1245(in $GIT_DIR/info/attributes)12461247a* foo !bar -baz12481249(in .gitattributes)1250abc foo bar baz12511252(in t/.gitattributes)1253ab* merge=filfre1254abc -foo -bar1255*.c frotz1256----------------------------------------------------------------12571258the attributes given to path `t/abc` are computed as follows:125912601. By examining `t/.gitattributes` (which is in the same1261 directory as the path in question), Git finds that the first1262 line matches. `merge` attribute is set. It also finds that1263 the second line matches, and attributes `foo` and `bar`1264 are unset.126512662. Then it examines `.gitattributes` (which is in the parent1267 directory), and finds that the first line matches, but1268 `t/.gitattributes` file already decided how `merge`, `foo`1269 and `bar` attributes should be given to this path, so it1270 leaves `foo` and `bar` unset. Attribute `baz` is set.127112723. Finally it examines `$GIT_DIR/info/attributes`. This file1273 is used to override the in-tree settings. The first line is1274 a match, and `foo` is set, `bar` is reverted to unspecified1275 state, and `baz` is unset.12761277As the result, the attributes assignment to `t/abc` becomes:12781279----------------------------------------------------------------1280foo set to true1281bar unspecified1282baz set to false1283merge set to string value "filfre"1284frotz unspecified1285----------------------------------------------------------------128612871288SEE ALSO1289--------1290linkgit:git-check-attr[1].12911292GIT1293---1294Part of the linkgit:git[1] suite