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