Documentation / gitattributes.txton commit Merge branch 'mv/maint-branch-m-symref' (efcce2e)
   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 if 'git-diff' generates textual
 220patch for the path or just says `Binary files differ`.  It also
 221can affect what line is shown on the hunk header `@@ -k,l +n,m @@`
 222line.
 223
 224Set::
 225
 226        A path to which the `diff` attribute is set is treated
 227        as text, even when they contain byte values that
 228        normally never appear in text files, such as NUL.
 229
 230Unset::
 231
 232        A path to which the `diff` attribute is unset will
 233        generate `Binary files differ`.
 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 custom diff driver.
 245        The driver program is given its input using the same
 246        calling convention as used for GIT_EXTERNAL_DIFF
 247        program.  This name is also used for custom hunk header
 248        selection.
 249
 250
 251Defining a custom 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 a custom 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 a three-way merge
 335~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 336
 337`merge`
 338^^^^^^^
 339
 340The attribute `merge` affects how three versions of a file is
 341merged when a file-level merge is necessary during `git merge`,
 342and other programs such as `git revert` and `git cherry-pick`.
 343
 344Set::
 345
 346        Built-in 3-way merge driver is used to merge the
 347        contents in a way similar to 'merge' command of `RCS`
 348        suite.  This is suitable for ordinary text files.
 349
 350Unset::
 351
 352        Take the version from the current branch as the
 353        tentative merge result, and declare that the merge has
 354        conflicts.  This is suitable for binary files that does
 355        not have a well-defined merge semantics.
 356
 357Unspecified::
 358
 359        By default, this uses the same built-in 3-way merge
 360        driver as is the case the `merge` attribute is set.
 361        However, `merge.default` configuration variable can name
 362        different merge driver to be used for paths to which the
 363        `merge` attribute is unspecified.
 364
 365String::
 366
 367        3-way merge is performed using the specified custom
 368        merge driver.  The built-in 3-way merge driver can be
 369        explicitly specified by asking for "text" driver; the
 370        built-in "take the current branch" driver can be
 371        requested with "binary".
 372
 373
 374Built-in merge drivers
 375^^^^^^^^^^^^^^^^^^^^^^
 376
 377There are a few built-in low-level merge drivers defined that
 378can be asked for via the `merge` attribute.
 379
 380text::
 381
 382        Usual 3-way file level merge for text files.  Conflicted
 383        regions are marked with conflict markers `<<<<<<<`,
 384        `=======` and `>>>>>>>`.  The version from your branch
 385        appears before the `=======` marker, and the version
 386        from the merged branch appears after the `=======`
 387        marker.
 388
 389binary::
 390
 391        Keep the version from your branch in the work tree, but
 392        leave the path in the conflicted state for the user to
 393        sort out.
 394
 395union::
 396
 397        Run 3-way file level merge for text files, but take
 398        lines from both versions, instead of leaving conflict
 399        markers.  This tends to leave the added lines in the
 400        resulting file in random order and the user should
 401        verify the result. Do not use this if you do not
 402        understand the implications.
 403
 404
 405Defining a custom merge driver
 406^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 407
 408The definition of a merge driver is done in the `.git/config`
 409file, not in the `gitattributes` file, so strictly speaking this
 410manual page is a wrong place to talk about it.  However...
 411
 412To define a custom merge driver `filfre`, add a section to your
 413`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 414
 415----------------------------------------------------------------
 416[merge "filfre"]
 417        name = feel-free merge driver
 418        driver = filfre %O %A %B
 419        recursive = binary
 420----------------------------------------------------------------
 421
 422The `merge.*.name` variable gives the driver a human-readable
 423name.
 424
 425The `merge.*.driver` variable's value is used to construct a
 426command to run to merge ancestor's version (`%O`), current
 427version (`%A`) and the other branches' version (`%B`).  These
 428three tokens are replaced with the names of temporary files that
 429hold the contents of these versions when the command line is
 430built.
 431
 432The merge driver is expected to leave the result of the merge in
 433the file named with `%A` by overwriting it, and exit with zero
 434status if it managed to merge them cleanly, or non-zero if there
 435were conflicts.
 436
 437The `merge.*.recursive` variable specifies what other merge
 438driver to use when the merge driver is called for an internal
 439merge between common ancestors, when there are more than one.
 440When left unspecified, the driver itself is used for both
 441internal merge and the final merge.
 442
 443
 444Checking whitespace errors
 445~~~~~~~~~~~~~~~~~~~~~~~~~~
 446
 447`whitespace`
 448^^^^^^^^^^^^
 449
 450The `core.whitespace` configuration variable allows you to define what
 451'diff' and 'apply' should consider whitespace errors for all paths in
 452the project (See linkgit:git-config[1]).  This attribute gives you finer
 453control per path.
 454
 455Set::
 456
 457        Notice all types of potential whitespace errors known to git.
 458
 459Unset::
 460
 461        Do not notice anything as error.
 462
 463Unspecified::
 464
 465        Use the value of `core.whitespace` configuration variable to
 466        decide what to notice as error.
 467
 468String::
 469
 470        Specify a comma separate list of common whitespace problems to
 471        notice in the same format as `core.whitespace` configuration
 472        variable.
 473
 474
 475Creating an archive
 476~~~~~~~~~~~~~~~~~~~
 477
 478`export-ignore`
 479^^^^^^^^^^^^^^^
 480
 481Files and directories with the attribute `export-ignore` won't be added to
 482archive files.
 483
 484`export-subst`
 485^^^^^^^^^^^^^^
 486
 487If the attribute `export-subst` is set for a file then git will expand
 488several placeholders when adding this file to an archive.  The
 489expansion depends on the availability of a commit ID, i.e., if
 490linkgit:git-archive[1] has been given a tree instead of a commit or a
 491tag then no replacement will be done.  The placeholders are the same
 492as those for the option `--pretty=format:` of linkgit:git-log[1],
 493except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
 494in the file.  E.g. the string `$Format:%H$` will be replaced by the
 495commit hash.
 496
 497
 498USING ATTRIBUTE MACROS
 499----------------------
 500
 501You do not want any end-of-line conversions applied to, nor textual diffs
 502produced for, any binary file you track.  You would need to specify e.g.
 503
 504------------
 505*.jpg -crlf -diff
 506------------
 507
 508but that may become cumbersome, when you have many attributes.  Using
 509attribute macros, you can specify groups of attributes set or unset at
 510the same time.  The system knows a built-in attribute macro, `binary`:
 511
 512------------
 513*.jpg binary
 514------------
 515
 516which is equivalent to the above.  Note that the attribute macros can only
 517be "Set" (see the above example that sets "binary" macro as if it were an
 518ordinary attribute --- setting it in turn unsets "crlf" and "diff").
 519
 520
 521DEFINING ATTRIBUTE MACROS
 522-------------------------
 523
 524Custom attribute macros can be defined only in the `.gitattributes` file
 525at the toplevel (i.e. not in any subdirectory).  The built-in attribute
 526macro "binary" is equivalent to:
 527
 528------------
 529[attr]binary -diff -crlf
 530------------
 531
 532
 533EXAMPLE
 534-------
 535
 536If you have these three `gitattributes` file:
 537
 538----------------------------------------------------------------
 539(in $GIT_DIR/info/attributes)
 540
 541a*      foo !bar -baz
 542
 543(in .gitattributes)
 544abc     foo bar baz
 545
 546(in t/.gitattributes)
 547ab*     merge=filfre
 548abc     -foo -bar
 549*.c     frotz
 550----------------------------------------------------------------
 551
 552the attributes given to path `t/abc` are computed as follows:
 553
 5541. By examining `t/.gitattributes` (which is in the same
 555   directory as the path in question), git finds that the first
 556   line matches.  `merge` attribute is set.  It also finds that
 557   the second line matches, and attributes `foo` and `bar`
 558   are unset.
 559
 5602. Then it examines `.gitattributes` (which is in the parent
 561   directory), and finds that the first line matches, but
 562   `t/.gitattributes` file already decided how `merge`, `foo`
 563   and `bar` attributes should be given to this path, so it
 564   leaves `foo` and `bar` unset.  Attribute `baz` is set.
 565
 5663. Finally it examines `$GIT_DIR/info/attributes`.  This file
 567   is used to override the in-tree settings.  The first line is
 568   a match, and `foo` is set, `bar` is reverted to unspecified
 569   state, and `baz` is unset.
 570
 571As the result, the attributes assignment to `t/abc` becomes:
 572
 573----------------------------------------------------------------
 574foo     set to true
 575bar     unspecified
 576baz     set to false
 577merge   set to string value "filfre"
 578frotz   unspecified
 579----------------------------------------------------------------
 580
 581
 582
 583GIT
 584---
 585Part of the linkgit:git[1] suite