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