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