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