Documentation / gitattributes.txton commit Merge branch 'nd/doc-ignore' (4321fe0)
   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        pattern attr1 attr2 ...
  22
  23That is, a pattern followed by an attributes list,
  24separated by whitespaces.  When the 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 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 pattern matches the path, a later line
  56overrides an earlier line.  This overriding is done per
  57attribute.  The rules how the pattern matches paths are the
  58same as in `.gitignore` files; see linkgit:gitignore[5].
  59
  60When deciding what attributes are assigned to a path, git
  61consults `$GIT_DIR/info/attributes` file (which has the highest
  62precedence), `.gitattributes` file in the same directory as the
  63path in question, and its parent directories up to the toplevel of the
  64work tree (the further the directory that contains `.gitattributes`
  65is from the path in question, the lower its precedence). Finally
  66global and system-wide files are considered (they have the lowest
  67precedence).
  68
  69When the `.gitattributes` file is missing from the work tree, the
  70path in the index is used as a fall-back.  During checkout process,
  71`.gitattributes` in the index is used and then the file in the
  72working tree is used as a fall-back.
  73
  74If you wish to affect only a single repository (i.e., to assign
  75attributes to files that are particular to
  76one user's workflow for that repository), then
  77attributes should be placed in the `$GIT_DIR/info/attributes` file.
  78Attributes which should be version-controlled and distributed to other
  79repositories (i.e., attributes of interest to all users) should go into
  80`.gitattributes` files. Attributes that should affect all repositories
  81for a single user should be placed in a file specified by the
  82`core.attributesfile` configuration option (see linkgit:git-config[1]).
  83Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
  84is either not set or empty, $HOME/.config/git/attributes is used instead.
  85Attributes for all users on a system should be placed in the
  86`$(prefix)/etc/gitattributes` file.
  87
  88Sometimes you would need to override an setting of an attribute
  89for a path to `Unspecified` state.  This can be done by listing
  90the name of the attribute prefixed with an exclamation point `!`.
  91
  92
  93EFFECTS
  94-------
  95
  96Certain operations by git can be influenced by assigning
  97particular attributes to a path.  Currently, the following
  98operations are attributes-aware.
  99
 100Checking-out and checking-in
 101~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 102
 103These attributes affect how the contents stored in the
 104repository are copied to the working tree files when commands
 105such as 'git checkout' and 'git merge' run.  They also affect how
 106git stores the contents you prepare in the working tree in the
 107repository upon 'git add' and 'git commit'.
 108
 109`text`
 110^^^^^^
 111
 112This attribute enables and controls end-of-line normalization.  When a
 113text file is normalized, its line endings are converted to LF in the
 114repository.  To control what line ending style is used in the working
 115directory, use the `eol` attribute for a single file and the
 116`core.eol` configuration variable for all text files.
 117
 118Set::
 119
 120        Setting the `text` attribute on a path enables end-of-line
 121        normalization and marks the path as a text file.  End-of-line
 122        conversion takes place without guessing the content type.
 123
 124Unset::
 125
 126        Unsetting the `text` attribute on a path tells git not to
 127        attempt any end-of-line conversion upon checkin or checkout.
 128
 129Set to string value "auto"::
 130
 131        When `text` is set to "auto", the path is marked for automatic
 132        end-of-line normalization.  If git decides that the content is
 133        text, its line endings are normalized to LF on checkin.
 134
 135Unspecified::
 136
 137        If the `text` attribute is unspecified, git uses the
 138        `core.autocrlf` configuration variable to determine if the
 139        file should be converted.
 140
 141Any other value causes git to act as if `text` has been left
 142unspecified.
 143
 144`eol`
 145^^^^^
 146
 147This attribute sets a specific line-ending style to be used in the
 148working directory.  It enables end-of-line normalization without any
 149content checks, effectively setting the `text` attribute.
 150
 151Set to string value "crlf"::
 152
 153        This setting forces git to normalize line endings for this
 154        file on checkin and convert them to CRLF when the file is
 155        checked out.
 156
 157Set to string value "lf"::
 158
 159        This setting forces git to normalize line endings to LF on
 160        checkin and prevents conversion to CRLF when the file is
 161        checked out.
 162
 163Backwards compatibility with `crlf` attribute
 164^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 165
 166For backwards compatibility, the `crlf` attribute is interpreted as
 167follows:
 168
 169------------------------
 170crlf            text
 171-crlf           -text
 172crlf=input      eol=lf
 173------------------------
 174
 175End-of-line conversion
 176^^^^^^^^^^^^^^^^^^^^^^
 177
 178While git normally leaves file contents alone, it can be configured to
 179normalize line endings to LF in the repository and, optionally, to
 180convert them to CRLF when files are checked out.
 181
 182Here is an example that will make git normalize .txt, .vcproj and .sh
 183files, ensure that .vcproj files have CRLF and .sh files have LF in
 184the working directory, and prevent .jpg files from being normalized
 185regardless of their content.
 186
 187------------------------
 188*.txt           text
 189*.vcproj        eol=crlf
 190*.sh            eol=lf
 191*.jpg           -text
 192------------------------
 193
 194Other source code management systems normalize all text files in their
 195repositories, and there are two ways to enable similar automatic
 196normalization in git.
 197
 198If you simply want to have CRLF line endings in your working directory
 199regardless of the repository you are working with, you can set the
 200config variable "core.autocrlf" without changing any attributes.
 201
 202------------------------
 203[core]
 204        autocrlf = true
 205------------------------
 206
 207This does not force normalization of all text files, but does ensure
 208that text files that you introduce to the repository have their line
 209endings normalized to LF when they are added, and that files that are
 210already normalized in the repository stay normalized.
 211
 212If you want to interoperate with a source code management system that
 213enforces end-of-line normalization, or you simply want all text files
 214in your repository to be normalized, you should instead set the `text`
 215attribute to "auto" for _all_ files.
 216
 217------------------------
 218*       text=auto
 219------------------------
 220
 221This ensures that all files that git considers to be text will have
 222normalized (LF) line endings in the repository.  The `core.eol`
 223configuration variable controls which line endings git will use for
 224normalized files in your working directory; the default is to use the
 225native line ending for your platform, or CRLF if `core.autocrlf` is
 226set.
 227
 228NOTE: When `text=auto` normalization is enabled in an existing
 229repository, any text files containing CRLFs should be normalized.  If
 230they are not they will be normalized the next time someone tries to
 231change them, causing unfortunate misattribution.  From a clean working
 232directory:
 233
 234-------------------------------------------------
 235$ echo "* text=auto" >>.gitattributes
 236$ rm .git/index     # Remove the index to force git to
 237$ git reset         # re-scan the working directory
 238$ git status        # Show files that will be normalized
 239$ git add -u
 240$ git add .gitattributes
 241$ git commit -m "Introduce end-of-line normalization"
 242-------------------------------------------------
 243
 244If any files that should not be normalized show up in 'git status',
 245unset their `text` attribute before running 'git add -u'.
 246
 247------------------------
 248manual.pdf      -text
 249------------------------
 250
 251Conversely, text files that git does not detect can have normalization
 252enabled manually.
 253
 254------------------------
 255weirdchars.txt  text
 256------------------------
 257
 258If `core.safecrlf` is set to "true" or "warn", git verifies if
 259the conversion is reversible for the current setting of
 260`core.autocrlf`.  For "true", git rejects irreversible
 261conversions; for "warn", git only prints a warning but accepts
 262an irreversible conversion.  The safety triggers to prevent such
 263a conversion done to the files in the work tree, but there are a
 264few exceptions.  Even though...
 265
 266- 'git add' itself does not touch the files in the work tree, the
 267  next checkout would, so the safety triggers;
 268
 269- 'git apply' to update a text file with a patch does touch the files
 270  in the work tree, but the operation is about text files and CRLF
 271  conversion is about fixing the line ending inconsistencies, so the
 272  safety does not trigger;
 273
 274- 'git diff' itself does not touch the files in the work tree, it is
 275  often run to inspect the changes you intend to next 'git add'.  To
 276  catch potential problems early, safety triggers.
 277
 278
 279`ident`
 280^^^^^^^
 281
 282When the attribute `ident` is set for a path, git replaces
 283`$Id$` in the blob object with `$Id:`, followed by the
 28440-character hexadecimal blob object name, followed by a dollar
 285sign `$` upon checkout.  Any byte sequence that begins with
 286`$Id:` and ends with `$` in the worktree file is replaced
 287with `$Id$` upon check-in.
 288
 289
 290`filter`
 291^^^^^^^^
 292
 293A `filter` attribute can be set to a string value that names a
 294filter driver specified in the configuration.
 295
 296A filter driver consists of a `clean` command and a `smudge`
 297command, either of which can be left unspecified.  Upon
 298checkout, when the `smudge` command is specified, the command is
 299fed the blob object from its standard input, and its standard
 300output is used to update the worktree file.  Similarly, the
 301`clean` command is used to convert the contents of worktree file
 302upon checkin.
 303
 304One use of the content filtering is to massage the content into a shape
 305that is more convenient for the platform, filesystem, and the user to use.
 306For this mode of operation, the key phrase here is "more convenient" and
 307not "turning something unusable into usable".  In other words, the intent
 308is that if someone unsets the filter driver definition, or does not have
 309the appropriate filter program, the project should still be usable.
 310
 311Another use of the content filtering is to store the content that cannot
 312be directly used in the repository (e.g. a UUID that refers to the true
 313content stored outside git, or an encrypted content) and turn it into a
 314usable form upon checkout (e.g. download the external content, or decrypt
 315the encrypted content).
 316
 317These two filters behave differently, and by default, a filter is taken as
 318the former, massaging the contents into more convenient shape.  A missing
 319filter driver definition in the config, or a filter driver that exits with
 320a non-zero status, is not an error but makes the filter a no-op passthru.
 321
 322You can declare that a filter turns a content that by itself is unusable
 323into a usable content by setting the filter.<driver>.required configuration
 324variable to `true`.
 325
 326For example, in .gitattributes, you would assign the `filter`
 327attribute for paths.
 328
 329------------------------
 330*.c     filter=indent
 331------------------------
 332
 333Then you would define a "filter.indent.clean" and "filter.indent.smudge"
 334configuration in your .git/config to specify a pair of commands to
 335modify the contents of C programs when the source files are checked
 336in ("clean" is run) and checked out (no change is made because the
 337command is "cat").
 338
 339------------------------
 340[filter "indent"]
 341        clean = indent
 342        smudge = cat
 343------------------------
 344
 345For best results, `clean` should not alter its output further if it is
 346run twice ("clean->clean" should be equivalent to "clean"), and
 347multiple `smudge` commands should not alter `clean`'s output
 348("smudge->smudge->clean" should be equivalent to "clean").  See the
 349section on merging below.
 350
 351The "indent" filter is well-behaved in this regard: it will not modify
 352input that is already correctly indented.  In this case, the lack of a
 353smudge filter means that the clean filter _must_ accept its own output
 354without modifying it.
 355
 356If a filter _must_ succeed in order to make the stored contents usable,
 357you can declare that the filter is `required`, in the configuration:
 358
 359------------------------
 360[filter "crypt"]
 361        clean = openssl enc ...
 362        smudge = openssl enc -d ...
 363        required
 364------------------------
 365
 366Sequence "%f" on the filter command line is replaced with the name of
 367the file the filter is working on.  A filter might use this in keyword
 368substitution.  For example:
 369
 370------------------------
 371[filter "p4"]
 372        clean = git-p4-filter --clean %f
 373        smudge = git-p4-filter --smudge %f
 374------------------------
 375
 376
 377Interaction between checkin/checkout attributes
 378^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 379
 380In the check-in codepath, the worktree file is first converted
 381with `filter` driver (if specified and corresponding driver
 382defined), then the result is processed with `ident` (if
 383specified), and then finally with `text` (again, if specified
 384and applicable).
 385
 386In the check-out codepath, the blob content is first converted
 387with `text`, and then `ident` and fed to `filter`.
 388
 389
 390Merging branches with differing checkin/checkout attributes
 391^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 392
 393If you have added attributes to a file that cause the canonical
 394repository format for that file to change, such as adding a
 395clean/smudge filter or text/eol/ident attributes, merging anything
 396where the attribute is not in place would normally cause merge
 397conflicts.
 398
 399To prevent these unnecessary merge conflicts, git can be told to run a
 400virtual check-out and check-in of all three stages of a file when
 401resolving a three-way merge by setting the `merge.renormalize`
 402configuration variable.  This prevents changes caused by check-in
 403conversion from causing spurious merge conflicts when a converted file
 404is merged with an unconverted file.
 405
 406As long as a "smudge->clean" results in the same output as a "clean"
 407even on files that are already smudged, this strategy will
 408automatically resolve all filter-related conflicts.  Filters that do
 409not act in this way may cause additional merge conflicts that must be
 410resolved manually.
 411
 412
 413Generating diff text
 414~~~~~~~~~~~~~~~~~~~~
 415
 416`diff`
 417^^^^^^
 418
 419The attribute `diff` affects how 'git' generates diffs for particular
 420files. It can tell git whether to generate a textual patch for the path
 421or to treat the path as a binary file.  It can also affect what line is
 422shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an
 423external command to generate the diff, or ask git to convert binary
 424files to a text format before generating the diff.
 425
 426Set::
 427
 428        A path to which the `diff` attribute is set is treated
 429        as text, even when they contain byte values that
 430        normally never appear in text files, such as NUL.
 431
 432Unset::
 433
 434        A path to which the `diff` attribute is unset will
 435        generate `Binary files differ` (or a binary patch, if
 436        binary patches are enabled).
 437
 438Unspecified::
 439
 440        A path to which the `diff` attribute is unspecified
 441        first gets its contents inspected, and if it looks like
 442        text, it is treated as text.  Otherwise it would
 443        generate `Binary files differ`.
 444
 445String::
 446
 447        Diff is shown using the specified diff driver.  Each driver may
 448        specify one or more options, as described in the following
 449        section. The options for the diff driver "foo" are defined
 450        by the configuration variables in the "diff.foo" section of the
 451        git config file.
 452
 453
 454Defining an external diff driver
 455^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 456
 457The definition of a diff driver is done in `gitconfig`, not
 458`gitattributes` file, so strictly speaking this manual page is a
 459wrong place to talk about it.  However...
 460
 461To define an external diff driver `jcdiff`, add a section to your
 462`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 463
 464----------------------------------------------------------------
 465[diff "jcdiff"]
 466        command = j-c-diff
 467----------------------------------------------------------------
 468
 469When git needs to show you a diff for the path with `diff`
 470attribute set to `jcdiff`, it calls the command you specified
 471with the above configuration, i.e. `j-c-diff`, with 7
 472parameters, just like `GIT_EXTERNAL_DIFF` program is called.
 473See linkgit:git[1] for details.
 474
 475
 476Defining a custom hunk-header
 477^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 478
 479Each group of changes (called a "hunk") in the textual diff output
 480is prefixed with a line of the form:
 481
 482        @@ -k,l +n,m @@ TEXT
 483
 484This is called a 'hunk header'.  The "TEXT" portion is by default a line
 485that begins with an alphabet, an underscore or a dollar sign; this
 486matches what GNU 'diff -p' output uses.  This default selection however
 487is not suited for some contents, and you can use a customized pattern
 488to make a selection.
 489
 490First, in .gitattributes, you would assign the `diff` attribute
 491for paths.
 492
 493------------------------
 494*.tex   diff=tex
 495------------------------
 496
 497Then, you would define a "diff.tex.xfuncname" configuration to
 498specify a regular expression that matches a line that you would
 499want to appear as the hunk header "TEXT". Add a section to your
 500`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 501
 502------------------------
 503[diff "tex"]
 504        xfuncname = "^(\\\\(sub)*section\\{.*)$"
 505------------------------
 506
 507Note.  A single level of backslashes are eaten by the
 508configuration file parser, so you would need to double the
 509backslashes; the pattern above picks a line that begins with a
 510backslash, and zero or more occurrences of `sub` followed by
 511`section` followed by open brace, to the end of line.
 512
 513There are a few built-in patterns to make this easier, and `tex`
 514is one of them, so you do not have to write the above in your
 515configuration file (you still need to enable this with the
 516attribute mechanism, via `.gitattributes`).  The following built in
 517patterns are available:
 518
 519- `ada` suitable for source code in the Ada language.
 520
 521- `bibtex` suitable for files with BibTeX coded references.
 522
 523- `cpp` suitable for source code in the C and C++ languages.
 524
 525- `csharp` suitable for source code in the C# language.
 526
 527- `fortran` suitable for source code in the Fortran language.
 528
 529- `html` suitable for HTML/XHTML documents.
 530
 531- `java` suitable for source code in the Java language.
 532
 533- `matlab` suitable for source code in the MATLAB language.
 534
 535- `objc` suitable for source code in the Objective-C language.
 536
 537- `pascal` suitable for source code in the Pascal/Delphi language.
 538
 539- `perl` suitable for source code in the Perl language.
 540
 541- `php` suitable for source code in the PHP language.
 542
 543- `python` suitable for source code in the Python language.
 544
 545- `ruby` suitable for source code in the Ruby language.
 546
 547- `tex` suitable for source code for LaTeX documents.
 548
 549
 550Customizing word diff
 551^^^^^^^^^^^^^^^^^^^^^
 552
 553You can customize the rules that `git diff --word-diff` uses to
 554split words in a line, by specifying an appropriate regular expression
 555in the "diff.*.wordRegex" configuration variable.  For example, in TeX
 556a backslash followed by a sequence of letters forms a command, but
 557several such commands can be run together without intervening
 558whitespace.  To separate them, use a regular expression in your
 559`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 560
 561------------------------
 562[diff "tex"]
 563        wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
 564------------------------
 565
 566A built-in pattern is provided for all languages listed in the
 567previous section.
 568
 569
 570Performing text diffs of binary files
 571^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 572
 573Sometimes it is desirable to see the diff of a text-converted
 574version of some binary files. For example, a word processor
 575document can be converted to an ASCII text representation, and
 576the diff of the text shown. Even though this conversion loses
 577some information, the resulting diff is useful for human
 578viewing (but cannot be applied directly).
 579
 580The `textconv` config option is used to define a program for
 581performing such a conversion. The program should take a single
 582argument, the name of a file to convert, and produce the
 583resulting text on stdout.
 584
 585For example, to show the diff of the exif information of a
 586file instead of the binary information (assuming you have the
 587exif tool installed), add the following section to your
 588`$GIT_DIR/config` file (or `$HOME/.gitconfig` file):
 589
 590------------------------
 591[diff "jpg"]
 592        textconv = exif
 593------------------------
 594
 595NOTE: The text conversion is generally a one-way conversion;
 596in this example, we lose the actual image contents and focus
 597just on the text data. This means that diffs generated by
 598textconv are _not_ suitable for applying. For this reason,
 599only `git diff` and the `git log` family of commands (i.e.,
 600log, whatchanged, show) will perform text conversion. `git
 601format-patch` will never generate this output. If you want to
 602send somebody a text-converted diff of a binary file (e.g.,
 603because it quickly conveys the changes you have made), you
 604should generate it separately and send it as a comment _in
 605addition to_ the usual binary diff that you might send.
 606
 607Because text conversion can be slow, especially when doing a
 608large number of them with `git log -p`, git provides a mechanism
 609to cache the output and use it in future diffs.  To enable
 610caching, set the "cachetextconv" variable in your diff driver's
 611config. For example:
 612
 613------------------------
 614[diff "jpg"]
 615        textconv = exif
 616        cachetextconv = true
 617------------------------
 618
 619This will cache the result of running "exif" on each blob
 620indefinitely. If you change the textconv config variable for a
 621diff driver, git will automatically invalidate the cache entries
 622and re-run the textconv filter. If you want to invalidate the
 623cache manually (e.g., because your version of "exif" was updated
 624and now produces better output), you can remove the cache
 625manually with `git update-ref -d refs/notes/textconv/jpg` (where
 626"jpg" is the name of the diff driver, as in the example above).
 627
 628Choosing textconv versus external diff
 629^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 630
 631If you want to show differences between binary or specially-formatted
 632blobs in your repository, you can choose to use either an external diff
 633command, or to use textconv to convert them to a diff-able text format.
 634Which method you choose depends on your exact situation.
 635
 636The advantage of using an external diff command is flexibility. You are
 637not bound to find line-oriented changes, nor is it necessary for the
 638output to resemble unified diff. You are free to locate and report
 639changes in the most appropriate way for your data format.
 640
 641A textconv, by comparison, is much more limiting. You provide a
 642transformation of the data into a line-oriented text format, and git
 643uses its regular diff tools to generate the output. There are several
 644advantages to choosing this method:
 645
 6461. Ease of use. It is often much simpler to write a binary to text
 647   transformation than it is to perform your own diff. In many cases,
 648   existing programs can be used as textconv filters (e.g., exif,
 649   odt2txt).
 650
 6512. Git diff features. By performing only the transformation step
 652   yourself, you can still utilize many of git's diff features,
 653   including colorization, word-diff, and combined diffs for merges.
 654
 6553. Caching. Textconv caching can speed up repeated diffs, such as those
 656   you might trigger by running `git log -p`.
 657
 658
 659Marking files as binary
 660^^^^^^^^^^^^^^^^^^^^^^^
 661
 662Git usually guesses correctly whether a blob contains text or binary
 663data by examining the beginning of the contents. However, sometimes you
 664may want to override its decision, either because a blob contains binary
 665data later in the file, or because the content, while technically
 666composed of text characters, is opaque to a human reader. For example,
 667many postscript files contain only ascii characters, but produce noisy
 668and meaningless diffs.
 669
 670The simplest way to mark a file as binary is to unset the diff
 671attribute in the `.gitattributes` file:
 672
 673------------------------
 674*.ps -diff
 675------------------------
 676
 677This will cause git to generate `Binary files differ` (or a binary
 678patch, if binary patches are enabled) instead of a regular diff.
 679
 680However, one may also want to specify other diff driver attributes. For
 681example, you might want to use `textconv` to convert postscript files to
 682an ascii representation for human viewing, but otherwise treat them as
 683binary files. You cannot specify both `-diff` and `diff=ps` attributes.
 684The solution is to use the `diff.*.binary` config option:
 685
 686------------------------
 687[diff "ps"]
 688  textconv = ps2ascii
 689  binary = true
 690------------------------
 691
 692Performing a three-way merge
 693~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 694
 695`merge`
 696^^^^^^^
 697
 698The attribute `merge` affects how three versions of a file are
 699merged when a file-level merge is necessary during `git merge`,
 700and other commands such as `git revert` and `git cherry-pick`.
 701
 702Set::
 703
 704        Built-in 3-way merge driver is used to merge the
 705        contents in a way similar to 'merge' command of `RCS`
 706        suite.  This is suitable for ordinary text files.
 707
 708Unset::
 709
 710        Take the version from the current branch as the
 711        tentative merge result, and declare that the merge has
 712        conflicts.  This is suitable for binary files that do
 713        not have a well-defined merge semantics.
 714
 715Unspecified::
 716
 717        By default, this uses the same built-in 3-way merge
 718        driver as is the case when the `merge` attribute is set.
 719        However, the `merge.default` configuration variable can name
 720        different merge driver to be used with paths for which the
 721        `merge` attribute is unspecified.
 722
 723String::
 724
 725        3-way merge is performed using the specified custom
 726        merge driver.  The built-in 3-way merge driver can be
 727        explicitly specified by asking for "text" driver; the
 728        built-in "take the current branch" driver can be
 729        requested with "binary".
 730
 731
 732Built-in merge drivers
 733^^^^^^^^^^^^^^^^^^^^^^
 734
 735There are a few built-in low-level merge drivers defined that
 736can be asked for via the `merge` attribute.
 737
 738text::
 739
 740        Usual 3-way file level merge for text files.  Conflicted
 741        regions are marked with conflict markers `<<<<<<<`,
 742        `=======` and `>>>>>>>`.  The version from your branch
 743        appears before the `=======` marker, and the version
 744        from the merged branch appears after the `=======`
 745        marker.
 746
 747binary::
 748
 749        Keep the version from your branch in the work tree, but
 750        leave the path in the conflicted state for the user to
 751        sort out.
 752
 753union::
 754
 755        Run 3-way file level merge for text files, but take
 756        lines from both versions, instead of leaving conflict
 757        markers.  This tends to leave the added lines in the
 758        resulting file in random order and the user should
 759        verify the result. Do not use this if you do not
 760        understand the implications.
 761
 762
 763Defining a custom merge driver
 764^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 765
 766The definition of a merge driver is done in the `.git/config`
 767file, not in the `gitattributes` file, so strictly speaking this
 768manual page is a wrong place to talk about it.  However...
 769
 770To define a custom merge driver `filfre`, add a section to your
 771`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 772
 773----------------------------------------------------------------
 774[merge "filfre"]
 775        name = feel-free merge driver
 776        driver = filfre %O %A %B
 777        recursive = binary
 778----------------------------------------------------------------
 779
 780The `merge.*.name` variable gives the driver a human-readable
 781name.
 782
 783The `merge.*.driver` variable's value is used to construct a
 784command to run to merge ancestor's version (`%O`), current
 785version (`%A`) and the other branches' version (`%B`).  These
 786three tokens are replaced with the names of temporary files that
 787hold the contents of these versions when the command line is
 788built. Additionally, %L will be replaced with the conflict marker
 789size (see below).
 790
 791The merge driver is expected to leave the result of the merge in
 792the file named with `%A` by overwriting it, and exit with zero
 793status if it managed to merge them cleanly, or non-zero if there
 794were conflicts.
 795
 796The `merge.*.recursive` variable specifies what other merge
 797driver to use when the merge driver is called for an internal
 798merge between common ancestors, when there are more than one.
 799When left unspecified, the driver itself is used for both
 800internal merge and the final merge.
 801
 802
 803`conflict-marker-size`
 804^^^^^^^^^^^^^^^^^^^^^^
 805
 806This attribute controls the length of conflict markers left in
 807the work tree file during a conflicted merge.  Only setting to
 808the value to a positive integer has any meaningful effect.
 809
 810For example, this line in `.gitattributes` can be used to tell the merge
 811machinery to leave much longer (instead of the usual 7-character-long)
 812conflict markers when merging the file `Documentation/git-merge.txt`
 813results in a conflict.
 814
 815------------------------
 816Documentation/git-merge.txt     conflict-marker-size=32
 817------------------------
 818
 819
 820Checking whitespace errors
 821~~~~~~~~~~~~~~~~~~~~~~~~~~
 822
 823`whitespace`
 824^^^^^^^^^^^^
 825
 826The `core.whitespace` configuration variable allows you to define what
 827'diff' and 'apply' should consider whitespace errors for all paths in
 828the project (See linkgit:git-config[1]).  This attribute gives you finer
 829control per path.
 830
 831Set::
 832
 833        Notice all types of potential whitespace errors known to git.
 834        The tab width is taken from the value of the `core.whitespace`
 835        configuration variable.
 836
 837Unset::
 838
 839        Do not notice anything as error.
 840
 841Unspecified::
 842
 843        Use the value of the `core.whitespace` configuration variable to
 844        decide what to notice as error.
 845
 846String::
 847
 848        Specify a comma separate list of common whitespace problems to
 849        notice in the same format as the `core.whitespace` configuration
 850        variable.
 851
 852
 853Creating an archive
 854~~~~~~~~~~~~~~~~~~~
 855
 856`export-ignore`
 857^^^^^^^^^^^^^^^
 858
 859Files and directories with the attribute `export-ignore` won't be added to
 860archive files.
 861
 862`export-subst`
 863^^^^^^^^^^^^^^
 864
 865If the attribute `export-subst` is set for a file then git will expand
 866several placeholders when adding this file to an archive.  The
 867expansion depends on the availability of a commit ID, i.e., if
 868linkgit:git-archive[1] has been given a tree instead of a commit or a
 869tag then no replacement will be done.  The placeholders are the same
 870as those for the option `--pretty=format:` of linkgit:git-log[1],
 871except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
 872in the file.  E.g. the string `$Format:%H$` will be replaced by the
 873commit hash.
 874
 875
 876Packing objects
 877~~~~~~~~~~~~~~~
 878
 879`delta`
 880^^^^^^^
 881
 882Delta compression will not be attempted for blobs for paths with the
 883attribute `delta` set to false.
 884
 885
 886Viewing files in GUI tools
 887~~~~~~~~~~~~~~~~~~~~~~~~~~
 888
 889`encoding`
 890^^^^^^^^^^
 891
 892The value of this attribute specifies the character encoding that should
 893be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to
 894display the contents of the relevant file. Note that due to performance
 895considerations linkgit:gitk[1] does not use this attribute unless you
 896manually enable per-file encodings in its options.
 897
 898If this attribute is not set or has an invalid value, the value of the
 899`gui.encoding` configuration variable is used instead
 900(See linkgit:git-config[1]).
 901
 902
 903USING MACRO ATTRIBUTES
 904----------------------
 905
 906You do not want any end-of-line conversions applied to, nor textual diffs
 907produced for, any binary file you track.  You would need to specify e.g.
 908
 909------------
 910*.jpg -text -diff
 911------------
 912
 913but that may become cumbersome, when you have many attributes.  Using
 914macro attributes, you can define an attribute that, when set, also
 915sets or unsets a number of other attributes at the same time.  The
 916system knows a built-in macro attribute, `binary`:
 917
 918------------
 919*.jpg binary
 920------------
 921
 922Setting the "binary" attribute also unsets the "text" and "diff"
 923attributes as above.  Note that macro attributes can only be "Set",
 924though setting one might have the effect of setting or unsetting other
 925attributes or even returning other attributes to the "Unspecified"
 926state.
 927
 928
 929DEFINING MACRO ATTRIBUTES
 930-------------------------
 931
 932Custom macro attributes can be defined only in the `.gitattributes`
 933file at the toplevel (i.e. not in any subdirectory).  The built-in
 934macro attribute "binary" is equivalent to:
 935
 936------------
 937[attr]binary -diff -merge -text
 938------------
 939
 940
 941EXAMPLE
 942-------
 943
 944If you have these three `gitattributes` file:
 945
 946----------------------------------------------------------------
 947(in $GIT_DIR/info/attributes)
 948
 949a*      foo !bar -baz
 950
 951(in .gitattributes)
 952abc     foo bar baz
 953
 954(in t/.gitattributes)
 955ab*     merge=filfre
 956abc     -foo -bar
 957*.c     frotz
 958----------------------------------------------------------------
 959
 960the attributes given to path `t/abc` are computed as follows:
 961
 9621. By examining `t/.gitattributes` (which is in the same
 963   directory as the path in question), git finds that the first
 964   line matches.  `merge` attribute is set.  It also finds that
 965   the second line matches, and attributes `foo` and `bar`
 966   are unset.
 967
 9682. Then it examines `.gitattributes` (which is in the parent
 969   directory), and finds that the first line matches, but
 970   `t/.gitattributes` file already decided how `merge`, `foo`
 971   and `bar` attributes should be given to this path, so it
 972   leaves `foo` and `bar` unset.  Attribute `baz` is set.
 973
 9743. Finally it examines `$GIT_DIR/info/attributes`.  This file
 975   is used to override the in-tree settings.  The first line is
 976   a match, and `foo` is set, `bar` is reverted to unspecified
 977   state, and `baz` is unset.
 978
 979As the result, the attributes assignment to `t/abc` becomes:
 980
 981----------------------------------------------------------------
 982foo     set to true
 983bar     unspecified
 984baz     set to false
 985merge   set to string value "filfre"
 986frotz   unspecified
 987----------------------------------------------------------------
 988
 989
 990SEE ALSO
 991--------
 992linkgit:git-check-attr[1].
 993
 994GIT
 995---
 996Part of the linkgit:git[1] suite