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