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 glob attr1 attr2 ... 22 23That is, a glob pattern followed by an attributes list, 24separated by whitespaces. When the glob 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 glob 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 glob pattern matches the path, a later line 56overrides an earlier line. This overriding is done per 57attribute. 58 59When deciding what attributes are assigned to a path, git 60consults `$GIT_DIR/info/attributes` file (which has the highest 61precedence), `.gitattributes` file in the same directory as the 62path in question, and its parent directories (the further the 63directory that contains `.gitattributes` is from the path in 64question, the lower its precedence). 65 66If you wish to affect only a single repository (i.e., to assign 67attributes to files that are particular to one user's workflow), then 68attributes should be placed in the `$GIT_DIR/info/attributes` file. 69Attributes which should be version-controlled and distributed to other 70repositories (i.e., attributes of interest to all users) should go into 71`.gitattributes` files. 72 73Sometimes you would need to override an setting of an attribute 74for a path to `unspecified` state. This can be done by listing 75the name of the attribute prefixed with an exclamation point `!`. 76 77 78EFFECTS 79------- 80 81Certain operations by git can be influenced by assigning 82particular attributes to a path. Currently, the following 83operations are attributes-aware. 84 85Checking-out and checking-in 86~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 87 88These attributes affect how the contents stored in the 89repository are copied to the working tree files when commands 90such as 'git-checkout' and 'git-merge' run. They also affect how 91git stores the contents you prepare in the working tree in the 92repository upon 'git-add' and 'git-commit'. 93 94`crlf` 95^^^^^^ 96 97This attribute controls the line-ending convention. 98 99Set:: 100 101 Setting the `crlf` attribute on a path is meant to mark 102 the path as a "text" file. 'core.autocrlf' conversion 103 takes place without guessing the content type by 104 inspection. 105 106Unset:: 107 108 Unsetting the `crlf` attribute on a path tells git not to 109 attempt any end-of-line conversion upon checkin or checkout. 110 111Unspecified:: 112 113 Unspecified `crlf` attribute tells git to apply the 114 `core.autocrlf` conversion when the file content looks 115 like text. 116 117Set to string value "input":: 118 119 This is similar to setting the attribute to `true`, but 120 also forces git to act as if `core.autocrlf` is set to 121 `input` for the path. 122 123Any other value set to `crlf` attribute is ignored and git acts 124as if the attribute is left unspecified. 125 126 127The `core.autocrlf` conversion 128^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 129 130If the configuration variable `core.autocrlf` is false, no 131conversion is done. 132 133When `core.autocrlf` is true, it means that the platform wants 134CRLF line endings for files in the working tree, and you want to 135convert them back to the normal LF line endings when checking 136in to the repository. 137 138When `core.autocrlf` is set to "input", line endings are 139converted to LF upon checkin, but there is no conversion done 140upon checkout. 141 142If `core.safecrlf` is set to "true" or "warn", git verifies if 143the conversion is reversible for the current setting of 144`core.autocrlf`. For "true", git rejects irreversible 145conversions; for "warn", git only prints a warning but accepts 146an irreversible conversion. The safety triggers to prevent such 147a conversion done to the files in the work tree, but there are a 148few exceptions. Even though... 149 150- 'git-add' itself does not touch the files in the work tree, the 151 next checkout would, so the safety triggers; 152 153- 'git-apply' to update a text file with a patch does touch the files 154 in the work tree, but the operation is about text files and CRLF 155 conversion is about fixing the line ending inconsistencies, so the 156 safety does not trigger; 157 158- 'git-diff' itself does not touch the files in the work tree, it is 159 often run to inspect the changes you intend to next 'git-add'. To 160 catch potential problems early, safety triggers. 161 162 163`ident` 164^^^^^^^ 165 166When the attribute `ident` is set for a path, git replaces 167`$Id$` in the blob object with `$Id:`, followed by the 16840-character hexadecimal blob object name, followed by a dollar 169sign `$` upon checkout. Any byte sequence that begins with 170`$Id:` and ends with `$` in the worktree file is replaced 171with `$Id$` upon check-in. 172 173 174`filter` 175^^^^^^^^ 176 177A `filter` attribute can be set to a string value that names a 178filter driver specified in the configuration. 179 180A filter driver consists of a `clean` command and a `smudge` 181command, either of which can be left unspecified. Upon 182checkout, when the `smudge` command is specified, the command is 183fed the blob object from its standard input, and its standard 184output is used to update the worktree file. Similarly, the 185`clean` command is used to convert the contents of worktree file 186upon checkin. 187 188A missing filter driver definition in the config is not an error 189but makes the filter a no-op passthru. 190 191The content filtering is done to massage the content into a 192shape that is more convenient for the platform, filesystem, and 193the user to use. The key phrase here is "more convenient" and not 194"turning something unusable into usable". In other words, the 195intent is that if someone unsets the filter driver definition, 196or does not have the appropriate filter program, the project 197should still be usable. 198 199 200Interaction between checkin/checkout attributes 201^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 202 203In the check-in codepath, the worktree file is first converted 204with `filter` driver (if specified and corresponding driver 205defined), then the result is processed with `ident` (if 206specified), and then finally with `crlf` (again, if specified 207and applicable). 208 209In the check-out codepath, the blob content is first converted 210with `crlf`, and then `ident` and fed to `filter`. 211 212 213Generating diff text 214~~~~~~~~~~~~~~~~~~~~ 215 216`diff` 217^^^^^^ 218 219The attribute `diff` affects how 'git' generates diffs for particular 220files. It can tell git whether to generate a textual patch for the path 221or to treat the path as a binary file. It can also affect what line is 222shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an 223external command to generate the diff, or ask git to convert binary 224files to a text format before generating the diff. 225 226Set:: 227 228 A path to which the `diff` attribute is set is treated 229 as text, even when they contain byte values that 230 normally never appear in text files, such as NUL. 231 232Unset:: 233 234 A path to which the `diff` attribute is unset will 235 generate `Binary files differ` (or a binary patch, if 236 binary patches are enabled). 237 238Unspecified:: 239 240 A path to which the `diff` attribute is unspecified 241 first gets its contents inspected, and if it looks like 242 text, it is treated as text. Otherwise it would 243 generate `Binary files differ`. 244 245String:: 246 247 Diff is shown using the specified diff driver. Each driver may 248 specify one or more options, as described in the following 249 section. The options for the diff driver "foo" are defined 250 by the configuration variables in the "diff.foo" section of the 251 git config file. 252 253 254Defining an external diff driver 255^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 256 257The definition of a diff driver is done in `gitconfig`, not 258`gitattributes` file, so strictly speaking this manual page is a 259wrong place to talk about it. However... 260 261To define an external diff driver `jcdiff`, add a section to your 262`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 263 264---------------------------------------------------------------- 265[diff "jcdiff"] 266 command = j-c-diff 267---------------------------------------------------------------- 268 269When git needs to show you a diff for the path with `diff` 270attribute set to `jcdiff`, it calls the command you specified 271with the above configuration, i.e. `j-c-diff`, with 7 272parameters, just like `GIT_EXTERNAL_DIFF` program is called. 273See linkgit:git[1] for details. 274 275 276Defining a custom hunk-header 277^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278 279Each group of changes (called a "hunk") in the textual diff output 280is prefixed with a line of the form: 281 282 @@ -k,l +n,m @@ TEXT 283 284This is called a 'hunk header'. The "TEXT" portion is by default a line 285that begins with an alphabet, an underscore or a dollar sign; this 286matches what GNU 'diff -p' output uses. This default selection however 287is not suited for some contents, and you can use a customized pattern 288to make a selection. 289 290First, in .gitattributes, you would assign the `diff` attribute 291for paths. 292 293------------------------ 294*.tex diff=tex 295------------------------ 296 297Then, you would define a "diff.tex.xfuncname" configuration to 298specify a regular expression that matches a line that you would 299want to appear as the hunk header "TEXT", like this: 300 301------------------------ 302[diff "tex"] 303 xfuncname = "^(\\\\(sub)*section\\{.*)$" 304------------------------ 305 306Note. A single level of backslashes are eaten by the 307configuration file parser, so you would need to double the 308backslashes; the pattern above picks a line that begins with a 309backslash, and zero or more occurrences of `sub` followed by 310`section` followed by open brace, to the end of line. 311 312There are a few built-in patterns to make this easier, and `tex` 313is one of them, so you do not have to write the above in your 314configuration file (you still need to enable this with the 315attribute mechanism, via `.gitattributes`). The following built in 316patterns are available: 317 318- `bibtex` suitable for files with BibTeX coded references. 319 320- `cpp` suitable for source code in the C and C++ languages. 321 322- `html` suitable for HTML/XHTML documents. 323 324- `java` suitable for source code in the Java language. 325 326- `objc` suitable for source code in the Objective-C language. 327 328- `pascal` suitable for source code in the Pascal/Delphi language. 329 330- `php` suitable for source code in the PHP language. 331 332- `python` suitable for source code in the Python language. 333 334- `ruby` suitable for source code in the Ruby language. 335 336- `tex` suitable for source code for LaTeX documents. 337 338 339Customizing word diff 340^^^^^^^^^^^^^^^^^^^^^ 341 342You can customize the rules that `git diff --color-words` uses to 343split words in a line, by specifying an appropriate regular expression 344in the "diff.*.wordRegex" configuration variable. For example, in TeX 345a backslash followed by a sequence of letters forms a command, but 346several such commands can be run together without intervening 347whitespace. To separate them, use a regular expression such as 348 349------------------------ 350[diff "tex"] 351 wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" 352------------------------ 353 354A built-in pattern is provided for all languages listed in the 355previous section. 356 357 358Performing text diffs of binary files 359^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 360 361Sometimes it is desirable to see the diff of a text-converted 362version of some binary files. For example, a word processor 363document can be converted to an ASCII text representation, and 364the diff of the text shown. Even though this conversion loses 365some information, the resulting diff is useful for human 366viewing (but cannot be applied directly). 367 368The `textconv` config option is used to define a program for 369performing such a conversion. The program should take a single 370argument, the name of a file to convert, and produce the 371resulting text on stdout. 372 373For example, to show the diff of the exif information of a 374file instead of the binary information (assuming you have the 375exif tool installed): 376 377------------------------ 378[diff "jpg"] 379 textconv = exif 380------------------------ 381 382NOTE: The text conversion is generally a one-way conversion; 383in this example, we lose the actual image contents and focus 384just on the text data. This means that diffs generated by 385textconv are _not_ suitable for applying. For this reason, 386only `git diff` and the `git log` family of commands (i.e., 387log, whatchanged, show) will perform text conversion. `git 388format-patch` will never generate this output. If you want to 389send somebody a text-converted diff of a binary file (e.g., 390because it quickly conveys the changes you have made), you 391should generate it separately and send it as a comment _in 392addition to_ the usual binary diff that you might send. 393 394 395Performing a three-way merge 396~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 397 398`merge` 399^^^^^^^ 400 401The attribute `merge` affects how three versions of a file is 402merged when a file-level merge is necessary during `git merge`, 403and other programs such as `git revert` and `git cherry-pick`. 404 405Set:: 406 407 Built-in 3-way merge driver is used to merge the 408 contents in a way similar to 'merge' command of `RCS` 409 suite. This is suitable for ordinary text files. 410 411Unset:: 412 413 Take the version from the current branch as the 414 tentative merge result, and declare that the merge has 415 conflicts. This is suitable for binary files that does 416 not have a well-defined merge semantics. 417 418Unspecified:: 419 420 By default, this uses the same built-in 3-way merge 421 driver as is the case the `merge` attribute is set. 422 However, `merge.default` configuration variable can name 423 different merge driver to be used for paths to which the 424 `merge` attribute is unspecified. 425 426String:: 427 428 3-way merge is performed using the specified custom 429 merge driver. The built-in 3-way merge driver can be 430 explicitly specified by asking for "text" driver; the 431 built-in "take the current branch" driver can be 432 requested with "binary". 433 434 435Built-in merge drivers 436^^^^^^^^^^^^^^^^^^^^^^ 437 438There are a few built-in low-level merge drivers defined that 439can be asked for via the `merge` attribute. 440 441text:: 442 443 Usual 3-way file level merge for text files. Conflicted 444 regions are marked with conflict markers `<<<<<<<`, 445 `=======` and `>>>>>>>`. The version from your branch 446 appears before the `=======` marker, and the version 447 from the merged branch appears after the `=======` 448 marker. 449 450binary:: 451 452 Keep the version from your branch in the work tree, but 453 leave the path in the conflicted state for the user to 454 sort out. 455 456union:: 457 458 Run 3-way file level merge for text files, but take 459 lines from both versions, instead of leaving conflict 460 markers. This tends to leave the added lines in the 461 resulting file in random order and the user should 462 verify the result. Do not use this if you do not 463 understand the implications. 464 465 466Defining a custom merge driver 467^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 468 469The definition of a merge driver is done in the `.git/config` 470file, not in the `gitattributes` file, so strictly speaking this 471manual page is a wrong place to talk about it. However... 472 473To define a custom merge driver `filfre`, add a section to your 474`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 475 476---------------------------------------------------------------- 477[merge "filfre"] 478 name = feel-free merge driver 479 driver = filfre %O %A %B 480 recursive = binary 481---------------------------------------------------------------- 482 483The `merge.*.name` variable gives the driver a human-readable 484name. 485 486The `merge.*.driver` variable's value is used to construct a 487command to run to merge ancestor's version (`%O`), current 488version (`%A`) and the other branches' version (`%B`). These 489three tokens are replaced with the names of temporary files that 490hold the contents of these versions when the command line is 491built. 492 493The merge driver is expected to leave the result of the merge in 494the file named with `%A` by overwriting it, and exit with zero 495status if it managed to merge them cleanly, or non-zero if there 496were conflicts. 497 498The `merge.*.recursive` variable specifies what other merge 499driver to use when the merge driver is called for an internal 500merge between common ancestors, when there are more than one. 501When left unspecified, the driver itself is used for both 502internal merge and the final merge. 503 504 505Checking whitespace errors 506~~~~~~~~~~~~~~~~~~~~~~~~~~ 507 508`whitespace` 509^^^^^^^^^^^^ 510 511The `core.whitespace` configuration variable allows you to define what 512'diff' and 'apply' should consider whitespace errors for all paths in 513the project (See linkgit:git-config[1]). This attribute gives you finer 514control per path. 515 516Set:: 517 518 Notice all types of potential whitespace errors known to git. 519 520Unset:: 521 522 Do not notice anything as error. 523 524Unspecified:: 525 526 Use the value of `core.whitespace` configuration variable to 527 decide what to notice as error. 528 529String:: 530 531 Specify a comma separate list of common whitespace problems to 532 notice in the same format as `core.whitespace` configuration 533 variable. 534 535 536Creating an archive 537~~~~~~~~~~~~~~~~~~~ 538 539`export-ignore` 540^^^^^^^^^^^^^^^ 541 542Files and directories with the attribute `export-ignore` won't be added to 543archive files. 544 545`export-subst` 546^^^^^^^^^^^^^^ 547 548If the attribute `export-subst` is set for a file then git will expand 549several placeholders when adding this file to an archive. The 550expansion depends on the availability of a commit ID, i.e., if 551linkgit:git-archive[1] has been given a tree instead of a commit or a 552tag then no replacement will be done. The placeholders are the same 553as those for the option `--pretty=format:` of linkgit:git-log[1], 554except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` 555in the file. E.g. the string `$Format:%H$` will be replaced by the 556commit hash. 557 558 559Viewing files in GUI tools 560~~~~~~~~~~~~~~~~~~~~~~~~~~ 561 562`encoding` 563^^^^^^^^^^ 564 565The value of this attribute specifies the character encoding that should 566be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to 567display the contents of the relevant file. Note that due to performance 568considerations linkgit:gitk[1] does not use this attribute unless you 569manually enable per-file encodings in its options. 570 571If this attribute is not set or has an invalid value, the value of the 572`gui.encoding` configuration variable is used instead 573(See linkgit:git-config[1]). 574 575 576USING ATTRIBUTE MACROS 577---------------------- 578 579You do not want any end-of-line conversions applied to, nor textual diffs 580produced for, any binary file you track. You would need to specify e.g. 581 582------------ 583*.jpg -crlf -diff 584------------ 585 586but that may become cumbersome, when you have many attributes. Using 587attribute macros, you can specify groups of attributes set or unset at 588the same time. The system knows a built-in attribute macro, `binary`: 589 590------------ 591*.jpg binary 592------------ 593 594which is equivalent to the above. Note that the attribute macros can only 595be "Set" (see the above example that sets "binary" macro as if it were an 596ordinary attribute --- setting it in turn unsets "crlf" and "diff"). 597 598 599DEFINING ATTRIBUTE MACROS 600------------------------- 601 602Custom attribute macros can be defined only in the `.gitattributes` file 603at the toplevel (i.e. not in any subdirectory). The built-in attribute 604macro "binary" is equivalent to: 605 606------------ 607[attr]binary -diff -crlf 608------------ 609 610 611EXAMPLE 612------- 613 614If you have these three `gitattributes` file: 615 616---------------------------------------------------------------- 617(in $GIT_DIR/info/attributes) 618 619a* foo !bar -baz 620 621(in .gitattributes) 622abc foo bar baz 623 624(in t/.gitattributes) 625ab* merge=filfre 626abc -foo -bar 627*.c frotz 628---------------------------------------------------------------- 629 630the attributes given to path `t/abc` are computed as follows: 631 6321. By examining `t/.gitattributes` (which is in the same 633 directory as the path in question), git finds that the first 634 line matches. `merge` attribute is set. It also finds that 635 the second line matches, and attributes `foo` and `bar` 636 are unset. 637 6382. Then it examines `.gitattributes` (which is in the parent 639 directory), and finds that the first line matches, but 640 `t/.gitattributes` file already decided how `merge`, `foo` 641 and `bar` attributes should be given to this path, so it 642 leaves `foo` and `bar` unset. Attribute `baz` is set. 643 6443. Finally it examines `$GIT_DIR/info/attributes`. This file 645 is used to override the in-tree settings. The first line is 646 a match, and `foo` is set, `bar` is reverted to unspecified 647 state, and `baz` is unset. 648 649As the result, the attributes assignment to `t/abc` becomes: 650 651---------------------------------------------------------------- 652foo set to true 653bar unspecified 654baz set to false 655merge set to string value "filfre" 656frotz unspecified 657---------------------------------------------------------------- 658 659 660 661GIT 662--- 663Part of the linkgit:git[1] suite