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 to a path, git replaces 167`$Id$` in the blob object with `$Id:`, followed by 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 216The attribute `diff` affects how 'git' generates diffs for particular 217files. It can tell git whether to generate a textual patch for the path 218or to treat the path as a binary file. It can also affect what line is 219shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an 220external command to generate the diff, or ask git to convert binary 221files to a text format before generating the diff. 222 223Set:: 224 225 A path to which the `diff` attribute is set is treated 226 as text, even when they contain byte values that 227 normally never appear in text files, such as NUL. 228 229Unset:: 230 231 A path to which the `diff` attribute is unset will 232 generate `Binary files differ` (or a binary patch, if 233 binary patches are enabled). 234 235Unspecified:: 236 237 A path to which the `diff` attribute is unspecified 238 first gets its contents inspected, and if it looks like 239 text, it is treated as text. Otherwise it would 240 generate `Binary files differ`. 241 242String:: 243 244 Diff is shown using the specified diff driver. Each driver may 245 specify one or more options, as described in the following 246 section. The options for the diff driver "foo" are defined 247 by the configuration variables in the "diff.foo" section of the 248 git config file. 249 250 251Defining an external diff driver 252^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 253 254The definition of a diff driver is done in `gitconfig`, not 255`gitattributes` file, so strictly speaking this manual page is a 256wrong place to talk about it. However... 257 258To define an external diff driver `jcdiff`, add a section to your 259`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 260 261---------------------------------------------------------------- 262[diff "jcdiff"] 263 command = j-c-diff 264---------------------------------------------------------------- 265 266When git needs to show you a diff for the path with `diff` 267attribute set to `jcdiff`, it calls the command you specified 268with the above configuration, i.e. `j-c-diff`, with 7 269parameters, just like `GIT_EXTERNAL_DIFF` program is called. 270See linkgit:git[1] for details. 271 272 273Defining a custom hunk-header 274^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 275 276Each group of changes (called a "hunk") in the textual diff output 277is prefixed with a line of the form: 278 279 @@ -k,l +n,m @@ TEXT 280 281This is called a 'hunk header'. The "TEXT" portion is by default a line 282that begins with an alphabet, an underscore or a dollar sign; this 283matches what GNU 'diff -p' output uses. This default selection however 284is not suited for some contents, and you can use a customized pattern 285to make a selection. 286 287First, in .gitattributes, you would assign the `diff` attribute 288for paths. 289 290------------------------ 291*.tex diff=tex 292------------------------ 293 294Then, you would define a "diff.tex.xfuncname" configuration to 295specify a regular expression that matches a line that you would 296want to appear as the hunk header "TEXT", like this: 297 298------------------------ 299[diff "tex"] 300 xfuncname = "^(\\\\(sub)*section\\{.*)$" 301------------------------ 302 303Note. A single level of backslashes are eaten by the 304configuration file parser, so you would need to double the 305backslashes; the pattern above picks a line that begins with a 306backslash, and zero or more occurrences of `sub` followed by 307`section` followed by open brace, to the end of line. 308 309There are a few built-in patterns to make this easier, and `tex` 310is one of them, so you do not have to write the above in your 311configuration file (you still need to enable this with the 312attribute mechanism, via `.gitattributes`). The following built in 313patterns are available: 314 315- `bibtex` suitable for files with BibTeX coded references. 316 317- `html` suitable for HTML/XHTML documents. 318 319- `java` suitable for source code in the Java language. 320 321- `objc` suitable for source code in the Objective-C language. 322 323- `pascal` suitable for source code in the Pascal/Delphi language. 324 325- `php` suitable for source code in the PHP language. 326 327- `python` suitable for source code in the Python language. 328 329- `ruby` suitable for source code in the Ruby language. 330 331- `tex` suitable for source code for LaTeX documents. 332 333 334Performing text diffs of binary files 335^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 336 337Sometimes it is desirable to see the diff of a text-converted 338version of some binary files. For example, a word processor 339document can be converted to an ASCII text representation, and 340the diff of the text shown. Even though this conversion loses 341some information, the resulting diff is useful for human 342viewing (but cannot be applied directly). 343 344The `textconv` config option is used to define a program for 345performing such a conversion. The program should take a single 346argument, the name of a file to convert, and produce the 347resulting text on stdout. 348 349For example, to show the diff of the exif information of a 350file instead of the binary information (assuming you have the 351exif tool installed): 352 353------------------------ 354[diff "jpg"] 355 textconv = exif 356------------------------ 357 358NOTE: The text conversion is generally a one-way conversion; 359in this example, we lose the actual image contents and focus 360just on the text data. This means that diffs generated by 361textconv are _not_ suitable for applying. For this reason, 362only `git diff` and the `git log` family of commands (i.e., 363log, whatchanged, show) will perform text conversion. `git 364format-patch` will never generate this output. If you want to 365send somebody a text-converted diff of a binary file (e.g., 366because it quickly conveys the changes you have made), you 367should generate it separately and send it as a comment _in 368addition to_ the usual binary diff that you might send. 369 370 371Performing a three-way merge 372~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 373 374The attribute `merge` affects how three versions of a file is 375merged when a file-level merge is necessary during `git merge`, 376and other programs such as `git revert` and `git cherry-pick`. 377 378Set:: 379 380 Built-in 3-way merge driver is used to merge the 381 contents in a way similar to 'merge' command of `RCS` 382 suite. This is suitable for ordinary text files. 383 384Unset:: 385 386 Take the version from the current branch as the 387 tentative merge result, and declare that the merge has 388 conflicts. This is suitable for binary files that does 389 not have a well-defined merge semantics. 390 391Unspecified:: 392 393 By default, this uses the same built-in 3-way merge 394 driver as is the case the `merge` attribute is set. 395 However, `merge.default` configuration variable can name 396 different merge driver to be used for paths to which the 397 `merge` attribute is unspecified. 398 399String:: 400 401 3-way merge is performed using the specified custom 402 merge driver. The built-in 3-way merge driver can be 403 explicitly specified by asking for "text" driver; the 404 built-in "take the current branch" driver can be 405 requested with "binary". 406 407 408Built-in merge drivers 409^^^^^^^^^^^^^^^^^^^^^^ 410 411There are a few built-in low-level merge drivers defined that 412can be asked for via the `merge` attribute. 413 414text:: 415 416 Usual 3-way file level merge for text files. Conflicted 417 regions are marked with conflict markers `<<<<<<<`, 418 `=======` and `>>>>>>>`. The version from your branch 419 appears before the `=======` marker, and the version 420 from the merged branch appears after the `=======` 421 marker. 422 423binary:: 424 425 Keep the version from your branch in the work tree, but 426 leave the path in the conflicted state for the user to 427 sort out. 428 429union:: 430 431 Run 3-way file level merge for text files, but take 432 lines from both versions, instead of leaving conflict 433 markers. This tends to leave the added lines in the 434 resulting file in random order and the user should 435 verify the result. Do not use this if you do not 436 understand the implications. 437 438 439Defining a custom merge driver 440^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 441 442The definition of a merge driver is done in the `.git/config` 443file, not in the `gitattributes` file, so strictly speaking this 444manual page is a wrong place to talk about it. However... 445 446To define a custom merge driver `filfre`, add a section to your 447`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: 448 449---------------------------------------------------------------- 450[merge "filfre"] 451 name = feel-free merge driver 452 driver = filfre %O %A %B 453 recursive = binary 454---------------------------------------------------------------- 455 456The `merge.*.name` variable gives the driver a human-readable 457name. 458 459The `merge.*.driver` variable's value is used to construct a 460command to run to merge ancestor's version (`%O`), current 461version (`%A`) and the other branches' version (`%B`). These 462three tokens are replaced with the names of temporary files that 463hold the contents of these versions when the command line is 464built. 465 466The merge driver is expected to leave the result of the merge in 467the file named with `%A` by overwriting it, and exit with zero 468status if it managed to merge them cleanly, or non-zero if there 469were conflicts. 470 471The `merge.*.recursive` variable specifies what other merge 472driver to use when the merge driver is called for an internal 473merge between common ancestors, when there are more than one. 474When left unspecified, the driver itself is used for both 475internal merge and the final merge. 476 477 478Checking whitespace errors 479~~~~~~~~~~~~~~~~~~~~~~~~~~ 480 481`whitespace` 482^^^^^^^^^^^^ 483 484The `core.whitespace` configuration variable allows you to define what 485'diff' and 'apply' should consider whitespace errors for all paths in 486the project (See linkgit:git-config[1]). This attribute gives you finer 487control per path. 488 489Set:: 490 491 Notice all types of potential whitespace errors known to git. 492 493Unset:: 494 495 Do not notice anything as error. 496 497Unspecified:: 498 499 Use the value of `core.whitespace` configuration variable to 500 decide what to notice as error. 501 502String:: 503 504 Specify a comma separate list of common whitespace problems to 505 notice in the same format as `core.whitespace` configuration 506 variable. 507 508 509Creating an archive 510~~~~~~~~~~~~~~~~~~~ 511 512`export-ignore` 513^^^^^^^^^^^^^^^ 514 515Files and directories with the attribute `export-ignore` won't be added to 516archive files. 517 518`export-subst` 519^^^^^^^^^^^^^^ 520 521If the attribute `export-subst` is set for a file then git will expand 522several placeholders when adding this file to an archive. The 523expansion depends on the availability of a commit ID, i.e., if 524linkgit:git-archive[1] has been given a tree instead of a commit or a 525tag then no replacement will be done. The placeholders are the same 526as those for the option `--pretty=format:` of linkgit:git-log[1], 527except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` 528in the file. E.g. the string `$Format:%H$` will be replaced by the 529commit hash. 530 531 532USING ATTRIBUTE MACROS 533---------------------- 534 535You do not want any end-of-line conversions applied to, nor textual diffs 536produced for, any binary file you track. You would need to specify e.g. 537 538------------ 539*.jpg -crlf -diff 540------------ 541 542but that may become cumbersome, when you have many attributes. Using 543attribute macros, you can specify groups of attributes set or unset at 544the same time. The system knows a built-in attribute macro, `binary`: 545 546------------ 547*.jpg binary 548------------ 549 550which is equivalent to the above. Note that the attribute macros can only 551be "Set" (see the above example that sets "binary" macro as if it were an 552ordinary attribute --- setting it in turn unsets "crlf" and "diff"). 553 554 555DEFINING ATTRIBUTE MACROS 556------------------------- 557 558Custom attribute macros can be defined only in the `.gitattributes` file 559at the toplevel (i.e. not in any subdirectory). The built-in attribute 560macro "binary" is equivalent to: 561 562------------ 563[attr]binary -diff -crlf 564------------ 565 566 567EXAMPLE 568------- 569 570If you have these three `gitattributes` file: 571 572---------------------------------------------------------------- 573(in $GIT_DIR/info/attributes) 574 575a* foo !bar -baz 576 577(in .gitattributes) 578abc foo bar baz 579 580(in t/.gitattributes) 581ab* merge=filfre 582abc -foo -bar 583*.c frotz 584---------------------------------------------------------------- 585 586the attributes given to path `t/abc` are computed as follows: 587 5881. By examining `t/.gitattributes` (which is in the same 589 directory as the path in question), git finds that the first 590 line matches. `merge` attribute is set. It also finds that 591 the second line matches, and attributes `foo` and `bar` 592 are unset. 593 5942. Then it examines `.gitattributes` (which is in the parent 595 directory), and finds that the first line matches, but 596 `t/.gitattributes` file already decided how `merge`, `foo` 597 and `bar` attributes should be given to this path, so it 598 leaves `foo` and `bar` unset. Attribute `baz` is set. 599 6003. Finally it examines `$GIT_DIR/info/attributes`. This file 601 is used to override the in-tree settings. The first line is 602 a match, and `foo` is set, `bar` is reverted to unspecified 603 state, and `baz` is unset. 604 605As the result, the attributes assignment to `t/abc` becomes: 606 607---------------------------------------------------------------- 608foo set to true 609bar unspecified 610baz set to false 611merge set to string value "filfre" 612frotz unspecified 613---------------------------------------------------------------- 614 615 616 617GIT 618--- 619Part of the linkgit:git[1] suite