a2310fb920ecf64cacf6617c97383bbc4443a03c
   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. Leading and trailing whitespaces are
  25ignored. Lines that begin with '#' are ignored. Patterns
  26that begin with a double quote are quoted in C style.
  27When the pattern matches the path in question, the attributes
  28listed on the line are given to the path.
  29
  30Each attribute can be in one of these states for a given path:
  31
  32Set::
  33
  34        The path has the attribute with special value "true";
  35        this is specified by listing only the name of the
  36        attribute in the attribute list.
  37
  38Unset::
  39
  40        The path has the attribute with special value "false";
  41        this is specified by listing the name of the attribute
  42        prefixed with a dash `-` in the attribute list.
  43
  44Set to a value::
  45
  46        The path has the attribute with specified string value;
  47        this is specified by listing the name of the attribute
  48        followed by an equal sign `=` and its value in the
  49        attribute list.
  50
  51Unspecified::
  52
  53        No pattern matches the path, and nothing says if
  54        the path has or does not have the attribute, the
  55        attribute for the path is said to be Unspecified.
  56
  57When more than one pattern matches the path, a later line
  58overrides an earlier line.  This overriding is done per
  59attribute.
  60
  61The rules by which the pattern matches paths are the same as in
  62`.gitignore` files (see linkgit:gitignore[5]), with a few exceptions:
  63
  64  - negative patterns are forbidden
  65
  66  - patterns that match a directory do not recursively match paths
  67    inside that directory (so using the trailing-slash `path/` syntax is
  68    pointless in an attributes file; use `path/**` instead)
  69
  70When deciding what attributes are assigned to a path, Git
  71consults `$GIT_DIR/info/attributes` file (which has the highest
  72precedence), `.gitattributes` file in the same directory as the
  73path in question, and its parent directories up to the toplevel of the
  74work tree (the further the directory that contains `.gitattributes`
  75is from the path in question, the lower its precedence). Finally
  76global and system-wide files are considered (they have the lowest
  77precedence).
  78
  79When the `.gitattributes` file is missing from the work tree, the
  80path in the index is used as a fall-back.  During checkout process,
  81`.gitattributes` in the index is used and then the file in the
  82working tree is used as a fall-back.
  83
  84If you wish to affect only a single repository (i.e., to assign
  85attributes to files that are particular to
  86one user's workflow for that repository), then
  87attributes should be placed in the `$GIT_DIR/info/attributes` file.
  88Attributes which should be version-controlled and distributed to other
  89repositories (i.e., attributes of interest to all users) should go into
  90`.gitattributes` files. Attributes that should affect all repositories
  91for a single user should be placed in a file specified by the
  92`core.attributesFile` configuration option (see linkgit:git-config[1]).
  93Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
  94is either not set or empty, $HOME/.config/git/attributes is used instead.
  95Attributes for all users on a system should be placed in the
  96`$(prefix)/etc/gitattributes` file.
  97
  98Sometimes you would need to override a setting of an attribute
  99for a path to `Unspecified` state.  This can be done by listing
 100the name of the attribute prefixed with an exclamation point `!`.
 101
 102
 103EFFECTS
 104-------
 105
 106Certain operations by Git can be influenced by assigning
 107particular attributes to a path.  Currently, the following
 108operations are attributes-aware.
 109
 110Checking-out and checking-in
 111~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 112
 113These attributes affect how the contents stored in the
 114repository are copied to the working tree files when commands
 115such as 'git checkout' and 'git merge' run.  They also affect how
 116Git stores the contents you prepare in the working tree in the
 117repository upon 'git add' and 'git commit'.
 118
 119`text`
 120^^^^^^
 121
 122This attribute enables and controls end-of-line normalization.  When a
 123text file is normalized, its line endings are converted to LF in the
 124repository.  To control what line ending style is used in the working
 125directory, use the `eol` attribute for a single file and the
 126`core.eol` configuration variable for all text files.
 127Note that `core.autocrlf` overrides `core.eol`
 128
 129Set::
 130
 131        Setting the `text` attribute on a path enables end-of-line
 132        normalization and marks the path as a text file.  End-of-line
 133        conversion takes place without guessing the content type.
 134
 135Unset::
 136
 137        Unsetting the `text` attribute on a path tells Git not to
 138        attempt any end-of-line conversion upon checkin or checkout.
 139
 140Set to string value "auto"::
 141
 142        When `text` is set to "auto", the path is marked for automatic
 143        end-of-line conversion.  If Git decides that the content is
 144        text, its line endings are converted to LF on checkin.
 145        When the file has been committed with CRLF, no conversion is done.
 146
 147Unspecified::
 148
 149        If the `text` attribute is unspecified, Git uses the
 150        `core.autocrlf` configuration variable to determine if the
 151        file should be converted.
 152
 153Any other value causes Git to act as if `text` has been left
 154unspecified.
 155
 156`eol`
 157^^^^^
 158
 159This attribute sets a specific line-ending style to be used in the
 160working directory.  It enables end-of-line conversion without any
 161content checks, effectively setting the `text` attribute.  Note that
 162setting this attribute on paths which are in the index with CRLF line
 163endings may make the paths to be considered dirty.  Adding the path to
 164the index again will normalize the line endings in the index.
 165
 166Set to string value "crlf"::
 167
 168        This setting forces Git to normalize line endings for this
 169        file on checkin and convert them to CRLF when the file is
 170        checked out.
 171
 172Set to string value "lf"::
 173
 174        This setting forces Git to normalize line endings to LF on
 175        checkin and prevents conversion to CRLF when the file is
 176        checked out.
 177
 178Backwards compatibility with `crlf` attribute
 179^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 180
 181For backwards compatibility, the `crlf` attribute is interpreted as
 182follows:
 183
 184------------------------
 185crlf            text
 186-crlf           -text
 187crlf=input      eol=lf
 188------------------------
 189
 190End-of-line conversion
 191^^^^^^^^^^^^^^^^^^^^^^
 192
 193While Git normally leaves file contents alone, it can be configured to
 194normalize line endings to LF in the repository and, optionally, to
 195convert them to CRLF when files are checked out.
 196
 197If you simply want to have CRLF line endings in your working directory
 198regardless of the repository you are working with, you can set the
 199config variable "core.autocrlf" without using any attributes.
 200
 201------------------------
 202[core]
 203        autocrlf = true
 204------------------------
 205
 206This does not force normalization of text files, but does ensure
 207that text files that you introduce to the repository have their line
 208endings normalized to LF when they are added, and that files that are
 209already normalized in the repository stay normalized.
 210
 211If you want to ensure that text files that any contributor introduces to
 212the repository have their line endings normalized, you can set the
 213`text` attribute to "auto" for _all_ files.
 214
 215------------------------
 216*       text=auto
 217------------------------
 218
 219The attributes allow a fine-grained control, how the line endings
 220are converted.
 221Here is an example that will make Git normalize .txt, .vcproj and .sh
 222files, ensure that .vcproj files have CRLF and .sh files have LF in
 223the working directory, and prevent .jpg files from being normalized
 224regardless of their content.
 225
 226------------------------
 227*               text=auto
 228*.txt           text
 229*.vcproj        text eol=crlf
 230*.sh            text eol=lf
 231*.jpg           -text
 232------------------------
 233
 234NOTE: When `text=auto` conversion is enabled in a cross-platform
 235project using push and pull to a central repository the text files
 236containing CRLFs should be normalized.
 237
 238From a clean working directory:
 239
 240-------------------------------------------------
 241$ echo "* text=auto" >.gitattributes
 242$ git add --renormalize .
 243$ git status        # Show files that will be normalized
 244$ git commit -m "Introduce end-of-line normalization"
 245-------------------------------------------------
 246
 247If any files that should not be normalized show up in 'git status',
 248unset their `text` attribute before running 'git add -u'.
 249
 250------------------------
 251manual.pdf      -text
 252------------------------
 253
 254Conversely, text files that Git does not detect can have normalization
 255enabled manually.
 256
 257------------------------
 258weirdchars.txt  text
 259------------------------
 260
 261If `core.safecrlf` is set to "true" or "warn", Git verifies if
 262the conversion is reversible for the current setting of
 263`core.autocrlf`.  For "true", Git rejects irreversible
 264conversions; for "warn", Git only prints a warning but accepts
 265an irreversible conversion.  The safety triggers to prevent such
 266a conversion done to the files in the work tree, but there are a
 267few exceptions.  Even though...
 268
 269- 'git add' itself does not touch the files in the work tree, the
 270  next checkout would, so the safety triggers;
 271
 272- 'git apply' to update a text file with a patch does touch the files
 273  in the work tree, but the operation is about text files and CRLF
 274  conversion is about fixing the line ending inconsistencies, so the
 275  safety does not trigger;
 276
 277- 'git diff' itself does not touch the files in the work tree, it is
 278  often run to inspect the changes you intend to next 'git add'.  To
 279  catch potential problems early, safety triggers.
 280
 281
 282`working-tree-encoding`
 283^^^^^^^^^^^^^^^^^^^^^^^
 284
 285Git recognizes files encoded in ASCII or one of its supersets (e.g.
 286UTF-8, ISO-8859-1, ...) as text files. Files encoded in certain other
 287encodings (e.g. UTF-16) are interpreted as binary and consequently
 288built-in Git text processing tools (e.g. 'git diff') as well as most Git
 289web front ends do not visualize the contents of these files by default.
 290
 291In these cases you can tell Git the encoding of a file in the working
 292directory with the `working-tree-encoding` attribute. If a file with this
 293attribute is added to Git, then Git reencodes the content from the
 294specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
 295content in its internal data structure (called "the index"). On checkout
 296the content is reencoded back to the specified encoding.
 297
 298Please note that using the `working-tree-encoding` attribute may have a
 299number of pitfalls:
 300
 301- Alternative Git implementations (e.g. JGit or libgit2) and older Git
 302  versions (as of March 2018) do not support the `working-tree-encoding`
 303  attribute. If you decide to use the `working-tree-encoding` attribute
 304  in your repository, then it is strongly recommended to ensure that all
 305  clients working with the repository support it.
 306+
 307For example, Microsoft Visual Studio resources files (`*.rc`) or
 308PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
 309If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
 310a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
 311stored as UTF-8 internally. A client without `working-tree-encoding`
 312support will checkout `foo.ps1` as UTF-8 encoded file. This will
 313typically cause trouble for the users of this file.
 314+
 315If a Git client, that does not support the `working-tree-encoding`
 316attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
 317stored "as-is" internally (in this example probably as UTF-16).
 318A client with `working-tree-encoding` support will interpret the
 319internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
 320That operation will fail and cause an error.
 321
 322- Reencoding content to non-UTF encodings can cause errors as the
 323  conversion might not be UTF-8 round trip safe. If you suspect your
 324  encoding to not be round trip safe, then add it to
 325  `core.checkRoundtripEncoding` to make Git check the round trip
 326  encoding (see linkgit:git-config[1]). SHIFT-JIS (Japanese character
 327  set) is known to have round trip issues with UTF-8 and is checked by
 328  default.
 329
 330- Reencoding content requires resources that might slow down certain
 331  Git operations (e.g 'git checkout' or 'git add').
 332
 333Use the `working-tree-encoding` attribute only if you cannot store a file
 334in UTF-8 encoding and if you want Git to be able to process the content
 335as text.
 336
 337As an example, use the following attributes if your '*.ps1' files are
 338UTF-16 encoded with byte order mark (BOM) and you want Git to perform
 339automatic line ending conversion based on your platform.
 340
 341------------------------
 342*.ps1           text working-tree-encoding=UTF-16
 343------------------------
 344
 345Use the following attributes if your '*.ps1' files are UTF-16 little
 346endian encoded without BOM and you want Git to use Windows line endings
 347in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
 348you want UTF-16 little endian with BOM).
 349Please note, it is highly recommended to
 350explicitly define the line endings with `eol` if the `working-tree-encoding`
 351attribute is used to avoid ambiguity.
 352
 353------------------------
 354*.ps1           text working-tree-encoding=UTF-16LE eol=CRLF
 355------------------------
 356
 357You can get a list of all available encodings on your platform with the
 358following command:
 359
 360------------------------
 361iconv --list
 362------------------------
 363
 364If you do not know the encoding of a file, then you can use the `file`
 365command to guess the encoding:
 366
 367------------------------
 368file foo.ps1
 369------------------------
 370
 371
 372`ident`
 373^^^^^^^
 374
 375When the attribute `ident` is set for a path, Git replaces
 376`$Id$` in the blob object with `$Id:`, followed by the
 37740-character hexadecimal blob object name, followed by a dollar
 378sign `$` upon checkout.  Any byte sequence that begins with
 379`$Id:` and ends with `$` in the worktree file is replaced
 380with `$Id$` upon check-in.
 381
 382
 383`filter`
 384^^^^^^^^
 385
 386A `filter` attribute can be set to a string value that names a
 387filter driver specified in the configuration.
 388
 389A filter driver consists of a `clean` command and a `smudge`
 390command, either of which can be left unspecified.  Upon
 391checkout, when the `smudge` command is specified, the command is
 392fed the blob object from its standard input, and its standard
 393output is used to update the worktree file.  Similarly, the
 394`clean` command is used to convert the contents of worktree file
 395upon checkin. By default these commands process only a single
 396blob and terminate. If a long running `process` filter is used
 397in place of `clean` and/or `smudge` filters, then Git can process
 398all blobs with a single filter command invocation for the entire
 399life of a single Git command, for example `git add --all`. If a
 400long running `process` filter is configured then it always takes
 401precedence over a configured single blob filter. See section
 402below for the description of the protocol used to communicate with
 403a `process` filter.
 404
 405One use of the content filtering is to massage the content into a shape
 406that is more convenient for the platform, filesystem, and the user to use.
 407For this mode of operation, the key phrase here is "more convenient" and
 408not "turning something unusable into usable".  In other words, the intent
 409is that if someone unsets the filter driver definition, or does not have
 410the appropriate filter program, the project should still be usable.
 411
 412Another use of the content filtering is to store the content that cannot
 413be directly used in the repository (e.g. a UUID that refers to the true
 414content stored outside Git, or an encrypted content) and turn it into a
 415usable form upon checkout (e.g. download the external content, or decrypt
 416the encrypted content).
 417
 418These two filters behave differently, and by default, a filter is taken as
 419the former, massaging the contents into more convenient shape.  A missing
 420filter driver definition in the config, or a filter driver that exits with
 421a non-zero status, is not an error but makes the filter a no-op passthru.
 422
 423You can declare that a filter turns a content that by itself is unusable
 424into a usable content by setting the filter.<driver>.required configuration
 425variable to `true`.
 426
 427Note: Whenever the clean filter is changed, the repo should be renormalized:
 428$ git add --renormalize .
 429
 430For example, in .gitattributes, you would assign the `filter`
 431attribute for paths.
 432
 433------------------------
 434*.c     filter=indent
 435------------------------
 436
 437Then you would define a "filter.indent.clean" and "filter.indent.smudge"
 438configuration in your .git/config to specify a pair of commands to
 439modify the contents of C programs when the source files are checked
 440in ("clean" is run) and checked out (no change is made because the
 441command is "cat").
 442
 443------------------------
 444[filter "indent"]
 445        clean = indent
 446        smudge = cat
 447------------------------
 448
 449For best results, `clean` should not alter its output further if it is
 450run twice ("clean->clean" should be equivalent to "clean"), and
 451multiple `smudge` commands should not alter `clean`'s output
 452("smudge->smudge->clean" should be equivalent to "clean").  See the
 453section on merging below.
 454
 455The "indent" filter is well-behaved in this regard: it will not modify
 456input that is already correctly indented.  In this case, the lack of a
 457smudge filter means that the clean filter _must_ accept its own output
 458without modifying it.
 459
 460If a filter _must_ succeed in order to make the stored contents usable,
 461you can declare that the filter is `required`, in the configuration:
 462
 463------------------------
 464[filter "crypt"]
 465        clean = openssl enc ...
 466        smudge = openssl enc -d ...
 467        required
 468------------------------
 469
 470Sequence "%f" on the filter command line is replaced with the name of
 471the file the filter is working on.  A filter might use this in keyword
 472substitution.  For example:
 473
 474------------------------
 475[filter "p4"]
 476        clean = git-p4-filter --clean %f
 477        smudge = git-p4-filter --smudge %f
 478------------------------
 479
 480Note that "%f" is the name of the path that is being worked on. Depending
 481on the version that is being filtered, the corresponding file on disk may
 482not exist, or may have different contents. So, smudge and clean commands
 483should not try to access the file on disk, but only act as filters on the
 484content provided to them on standard input.
 485
 486Long Running Filter Process
 487^^^^^^^^^^^^^^^^^^^^^^^^^^^
 488
 489If the filter command (a string value) is defined via
 490`filter.<driver>.process` then Git can process all blobs with a
 491single filter invocation for the entire life of a single Git
 492command. This is achieved by using the long-running process protocol
 493(described in technical/long-running-process-protocol.txt).
 494
 495When Git encounters the first file that needs to be cleaned or smudged,
 496it starts the filter and performs the handshake. In the handshake, the
 497welcome message sent by Git is "git-filter-client", only version 2 is
 498suppported, and the supported capabilities are "clean", "smudge", and
 499"delay".
 500
 501Afterwards Git sends a list of "key=value" pairs terminated with
 502a flush packet. The list will contain at least the filter command
 503(based on the supported capabilities) and the pathname of the file
 504to filter relative to the repository root. Right after the flush packet
 505Git sends the content split in zero or more pkt-line packets and a
 506flush packet to terminate content. Please note, that the filter
 507must not send any response before it received the content and the
 508final flush packet. Also note that the "value" of a "key=value" pair
 509can contain the "=" character whereas the key would never contain
 510that character.
 511------------------------
 512packet:          git> command=smudge
 513packet:          git> pathname=path/testfile.dat
 514packet:          git> 0000
 515packet:          git> CONTENT
 516packet:          git> 0000
 517------------------------
 518
 519The filter is expected to respond with a list of "key=value" pairs
 520terminated with a flush packet. If the filter does not experience
 521problems then the list must contain a "success" status. Right after
 522these packets the filter is expected to send the content in zero
 523or more pkt-line packets and a flush packet at the end. Finally, a
 524second list of "key=value" pairs terminated with a flush packet
 525is expected. The filter can change the status in the second list
 526or keep the status as is with an empty list. Please note that the
 527empty list must be terminated with a flush packet regardless.
 528
 529------------------------
 530packet:          git< status=success
 531packet:          git< 0000
 532packet:          git< SMUDGED_CONTENT
 533packet:          git< 0000
 534packet:          git< 0000  # empty list, keep "status=success" unchanged!
 535------------------------
 536
 537If the result content is empty then the filter is expected to respond
 538with a "success" status and a flush packet to signal the empty content.
 539------------------------
 540packet:          git< status=success
 541packet:          git< 0000
 542packet:          git< 0000  # empty content!
 543packet:          git< 0000  # empty list, keep "status=success" unchanged!
 544------------------------
 545
 546In case the filter cannot or does not want to process the content,
 547it is expected to respond with an "error" status.
 548------------------------
 549packet:          git< status=error
 550packet:          git< 0000
 551------------------------
 552
 553If the filter experiences an error during processing, then it can
 554send the status "error" after the content was (partially or
 555completely) sent.
 556------------------------
 557packet:          git< status=success
 558packet:          git< 0000
 559packet:          git< HALF_WRITTEN_ERRONEOUS_CONTENT
 560packet:          git< 0000
 561packet:          git< status=error
 562packet:          git< 0000
 563------------------------
 564
 565In case the filter cannot or does not want to process the content
 566as well as any future content for the lifetime of the Git process,
 567then it is expected to respond with an "abort" status at any point
 568in the protocol.
 569------------------------
 570packet:          git< status=abort
 571packet:          git< 0000
 572------------------------
 573
 574Git neither stops nor restarts the filter process in case the
 575"error"/"abort" status is set. However, Git sets its exit code
 576according to the `filter.<driver>.required` flag, mimicking the
 577behavior of the `filter.<driver>.clean` / `filter.<driver>.smudge`
 578mechanism.
 579
 580If the filter dies during the communication or does not adhere to
 581the protocol then Git will stop the filter process and restart it
 582with the next file that needs to be processed. Depending on the
 583`filter.<driver>.required` flag Git will interpret that as error.
 584
 585Delay
 586^^^^^
 587
 588If the filter supports the "delay" capability, then Git can send the
 589flag "can-delay" after the filter command and pathname. This flag
 590denotes that the filter can delay filtering the current blob (e.g. to
 591compensate network latencies) by responding with no content but with
 592the status "delayed" and a flush packet.
 593------------------------
 594packet:          git> command=smudge
 595packet:          git> pathname=path/testfile.dat
 596packet:          git> can-delay=1
 597packet:          git> 0000
 598packet:          git> CONTENT
 599packet:          git> 0000
 600packet:          git< status=delayed
 601packet:          git< 0000
 602------------------------
 603
 604If the filter supports the "delay" capability then it must support the
 605"list_available_blobs" command. If Git sends this command, then the
 606filter is expected to return a list of pathnames representing blobs
 607that have been delayed earlier and are now available.
 608The list must be terminated with a flush packet followed
 609by a "success" status that is also terminated with a flush packet. If
 610no blobs for the delayed paths are available, yet, then the filter is
 611expected to block the response until at least one blob becomes
 612available. The filter can tell Git that it has no more delayed blobs
 613by sending an empty list. As soon as the filter responds with an empty
 614list, Git stops asking. All blobs that Git has not received at this
 615point are considered missing and will result in an error.
 616
 617------------------------
 618packet:          git> command=list_available_blobs
 619packet:          git> 0000
 620packet:          git< pathname=path/testfile.dat
 621packet:          git< pathname=path/otherfile.dat
 622packet:          git< 0000
 623packet:          git< status=success
 624packet:          git< 0000
 625------------------------
 626
 627After Git received the pathnames, it will request the corresponding
 628blobs again. These requests contain a pathname and an empty content
 629section. The filter is expected to respond with the smudged content
 630in the usual way as explained above.
 631------------------------
 632packet:          git> command=smudge
 633packet:          git> pathname=path/testfile.dat
 634packet:          git> 0000
 635packet:          git> 0000  # empty content!
 636packet:          git< status=success
 637packet:          git< 0000
 638packet:          git< SMUDGED_CONTENT
 639packet:          git< 0000
 640packet:          git< 0000  # empty list, keep "status=success" unchanged!
 641------------------------
 642
 643Example
 644^^^^^^^
 645
 646A long running filter demo implementation can be found in
 647`contrib/long-running-filter/example.pl` located in the Git
 648core repository. If you develop your own long running filter
 649process then the `GIT_TRACE_PACKET` environment variables can be
 650very helpful for debugging (see linkgit:git[1]).
 651
 652Please note that you cannot use an existing `filter.<driver>.clean`
 653or `filter.<driver>.smudge` command with `filter.<driver>.process`
 654because the former two use a different inter process communication
 655protocol than the latter one.
 656
 657
 658Interaction between checkin/checkout attributes
 659^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 660
 661In the check-in codepath, the worktree file is first converted
 662with `filter` driver (if specified and corresponding driver
 663defined), then the result is processed with `ident` (if
 664specified), and then finally with `text` (again, if specified
 665and applicable).
 666
 667In the check-out codepath, the blob content is first converted
 668with `text`, and then `ident` and fed to `filter`.
 669
 670
 671Merging branches with differing checkin/checkout attributes
 672^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 673
 674If you have added attributes to a file that cause the canonical
 675repository format for that file to change, such as adding a
 676clean/smudge filter or text/eol/ident attributes, merging anything
 677where the attribute is not in place would normally cause merge
 678conflicts.
 679
 680To prevent these unnecessary merge conflicts, Git can be told to run a
 681virtual check-out and check-in of all three stages of a file when
 682resolving a three-way merge by setting the `merge.renormalize`
 683configuration variable.  This prevents changes caused by check-in
 684conversion from causing spurious merge conflicts when a converted file
 685is merged with an unconverted file.
 686
 687As long as a "smudge->clean" results in the same output as a "clean"
 688even on files that are already smudged, this strategy will
 689automatically resolve all filter-related conflicts.  Filters that do
 690not act in this way may cause additional merge conflicts that must be
 691resolved manually.
 692
 693
 694Generating diff text
 695~~~~~~~~~~~~~~~~~~~~
 696
 697`diff`
 698^^^^^^
 699
 700The attribute `diff` affects how Git generates diffs for particular
 701files. It can tell Git whether to generate a textual patch for the path
 702or to treat the path as a binary file.  It can also affect what line is
 703shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an
 704external command to generate the diff, or ask Git to convert binary
 705files to a text format before generating the diff.
 706
 707Set::
 708
 709        A path to which the `diff` attribute is set is treated
 710        as text, even when they contain byte values that
 711        normally never appear in text files, such as NUL.
 712
 713Unset::
 714
 715        A path to which the `diff` attribute is unset will
 716        generate `Binary files differ` (or a binary patch, if
 717        binary patches are enabled).
 718
 719Unspecified::
 720
 721        A path to which the `diff` attribute is unspecified
 722        first gets its contents inspected, and if it looks like
 723        text and is smaller than core.bigFileThreshold, it is treated
 724        as text. Otherwise it would generate `Binary files differ`.
 725
 726String::
 727
 728        Diff is shown using the specified diff driver.  Each driver may
 729        specify one or more options, as described in the following
 730        section. The options for the diff driver "foo" are defined
 731        by the configuration variables in the "diff.foo" section of the
 732        Git config file.
 733
 734
 735Defining an external diff driver
 736^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 737
 738The definition of a diff driver is done in `gitconfig`, not
 739`gitattributes` file, so strictly speaking this manual page is a
 740wrong place to talk about it.  However...
 741
 742To define an external diff driver `jcdiff`, add a section to your
 743`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 744
 745----------------------------------------------------------------
 746[diff "jcdiff"]
 747        command = j-c-diff
 748----------------------------------------------------------------
 749
 750When Git needs to show you a diff for the path with `diff`
 751attribute set to `jcdiff`, it calls the command you specified
 752with the above configuration, i.e. `j-c-diff`, with 7
 753parameters, just like `GIT_EXTERNAL_DIFF` program is called.
 754See linkgit:git[1] for details.
 755
 756
 757Defining a custom hunk-header
 758^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 759
 760Each group of changes (called a "hunk") in the textual diff output
 761is prefixed with a line of the form:
 762
 763        @@ -k,l +n,m @@ TEXT
 764
 765This is called a 'hunk header'.  The "TEXT" portion is by default a line
 766that begins with an alphabet, an underscore or a dollar sign; this
 767matches what GNU 'diff -p' output uses.  This default selection however
 768is not suited for some contents, and you can use a customized pattern
 769to make a selection.
 770
 771First, in .gitattributes, you would assign the `diff` attribute
 772for paths.
 773
 774------------------------
 775*.tex   diff=tex
 776------------------------
 777
 778Then, you would define a "diff.tex.xfuncname" configuration to
 779specify a regular expression that matches a line that you would
 780want to appear as the hunk header "TEXT". Add a section to your
 781`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 782
 783------------------------
 784[diff "tex"]
 785        xfuncname = "^(\\\\(sub)*section\\{.*)$"
 786------------------------
 787
 788Note.  A single level of backslashes are eaten by the
 789configuration file parser, so you would need to double the
 790backslashes; the pattern above picks a line that begins with a
 791backslash, and zero or more occurrences of `sub` followed by
 792`section` followed by open brace, to the end of line.
 793
 794There are a few built-in patterns to make this easier, and `tex`
 795is one of them, so you do not have to write the above in your
 796configuration file (you still need to enable this with the
 797attribute mechanism, via `.gitattributes`).  The following built in
 798patterns are available:
 799
 800- `ada` suitable for source code in the Ada language.
 801
 802- `bibtex` suitable for files with BibTeX coded references.
 803
 804- `cpp` suitable for source code in the C and C++ languages.
 805
 806- `csharp` suitable for source code in the C# language.
 807
 808- `css` suitable for cascading style sheets.
 809
 810- `fortran` suitable for source code in the Fortran language.
 811
 812- `fountain` suitable for Fountain documents.
 813
 814- `golang` suitable for source code in the Go language.
 815
 816- `html` suitable for HTML/XHTML documents.
 817
 818- `java` suitable for source code in the Java language.
 819
 820- `matlab` suitable for source code in the MATLAB language.
 821
 822- `objc` suitable for source code in the Objective-C language.
 823
 824- `pascal` suitable for source code in the Pascal/Delphi language.
 825
 826- `perl` suitable for source code in the Perl language.
 827
 828- `php` suitable for source code in the PHP language.
 829
 830- `python` suitable for source code in the Python language.
 831
 832- `ruby` suitable for source code in the Ruby language.
 833
 834- `tex` suitable for source code for LaTeX documents.
 835
 836
 837Customizing word diff
 838^^^^^^^^^^^^^^^^^^^^^
 839
 840You can customize the rules that `git diff --word-diff` uses to
 841split words in a line, by specifying an appropriate regular expression
 842in the "diff.*.wordRegex" configuration variable.  For example, in TeX
 843a backslash followed by a sequence of letters forms a command, but
 844several such commands can be run together without intervening
 845whitespace.  To separate them, use a regular expression in your
 846`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 847
 848------------------------
 849[diff "tex"]
 850        wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
 851------------------------
 852
 853A built-in pattern is provided for all languages listed in the
 854previous section.
 855
 856
 857Performing text diffs of binary files
 858^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 859
 860Sometimes it is desirable to see the diff of a text-converted
 861version of some binary files. For example, a word processor
 862document can be converted to an ASCII text representation, and
 863the diff of the text shown. Even though this conversion loses
 864some information, the resulting diff is useful for human
 865viewing (but cannot be applied directly).
 866
 867The `textconv` config option is used to define a program for
 868performing such a conversion. The program should take a single
 869argument, the name of a file to convert, and produce the
 870resulting text on stdout.
 871
 872For example, to show the diff of the exif information of a
 873file instead of the binary information (assuming you have the
 874exif tool installed), add the following section to your
 875`$GIT_DIR/config` file (or `$HOME/.gitconfig` file):
 876
 877------------------------
 878[diff "jpg"]
 879        textconv = exif
 880------------------------
 881
 882NOTE: The text conversion is generally a one-way conversion;
 883in this example, we lose the actual image contents and focus
 884just on the text data. This means that diffs generated by
 885textconv are _not_ suitable for applying. For this reason,
 886only `git diff` and the `git log` family of commands (i.e.,
 887log, whatchanged, show) will perform text conversion. `git
 888format-patch` will never generate this output. If you want to
 889send somebody a text-converted diff of a binary file (e.g.,
 890because it quickly conveys the changes you have made), you
 891should generate it separately and send it as a comment _in
 892addition to_ the usual binary diff that you might send.
 893
 894Because text conversion can be slow, especially when doing a
 895large number of them with `git log -p`, Git provides a mechanism
 896to cache the output and use it in future diffs.  To enable
 897caching, set the "cachetextconv" variable in your diff driver's
 898config. For example:
 899
 900------------------------
 901[diff "jpg"]
 902        textconv = exif
 903        cachetextconv = true
 904------------------------
 905
 906This will cache the result of running "exif" on each blob
 907indefinitely. If you change the textconv config variable for a
 908diff driver, Git will automatically invalidate the cache entries
 909and re-run the textconv filter. If you want to invalidate the
 910cache manually (e.g., because your version of "exif" was updated
 911and now produces better output), you can remove the cache
 912manually with `git update-ref -d refs/notes/textconv/jpg` (where
 913"jpg" is the name of the diff driver, as in the example above).
 914
 915Choosing textconv versus external diff
 916^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 917
 918If you want to show differences between binary or specially-formatted
 919blobs in your repository, you can choose to use either an external diff
 920command, or to use textconv to convert them to a diff-able text format.
 921Which method you choose depends on your exact situation.
 922
 923The advantage of using an external diff command is flexibility. You are
 924not bound to find line-oriented changes, nor is it necessary for the
 925output to resemble unified diff. You are free to locate and report
 926changes in the most appropriate way for your data format.
 927
 928A textconv, by comparison, is much more limiting. You provide a
 929transformation of the data into a line-oriented text format, and Git
 930uses its regular diff tools to generate the output. There are several
 931advantages to choosing this method:
 932
 9331. Ease of use. It is often much simpler to write a binary to text
 934   transformation than it is to perform your own diff. In many cases,
 935   existing programs can be used as textconv filters (e.g., exif,
 936   odt2txt).
 937
 9382. Git diff features. By performing only the transformation step
 939   yourself, you can still utilize many of Git's diff features,
 940   including colorization, word-diff, and combined diffs for merges.
 941
 9423. Caching. Textconv caching can speed up repeated diffs, such as those
 943   you might trigger by running `git log -p`.
 944
 945
 946Marking files as binary
 947^^^^^^^^^^^^^^^^^^^^^^^
 948
 949Git usually guesses correctly whether a blob contains text or binary
 950data by examining the beginning of the contents. However, sometimes you
 951may want to override its decision, either because a blob contains binary
 952data later in the file, or because the content, while technically
 953composed of text characters, is opaque to a human reader. For example,
 954many postscript files contain only ASCII characters, but produce noisy
 955and meaningless diffs.
 956
 957The simplest way to mark a file as binary is to unset the diff
 958attribute in the `.gitattributes` file:
 959
 960------------------------
 961*.ps -diff
 962------------------------
 963
 964This will cause Git to generate `Binary files differ` (or a binary
 965patch, if binary patches are enabled) instead of a regular diff.
 966
 967However, one may also want to specify other diff driver attributes. For
 968example, you might want to use `textconv` to convert postscript files to
 969an ASCII representation for human viewing, but otherwise treat them as
 970binary files. You cannot specify both `-diff` and `diff=ps` attributes.
 971The solution is to use the `diff.*.binary` config option:
 972
 973------------------------
 974[diff "ps"]
 975  textconv = ps2ascii
 976  binary = true
 977------------------------
 978
 979Performing a three-way merge
 980~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 981
 982`merge`
 983^^^^^^^
 984
 985The attribute `merge` affects how three versions of a file are
 986merged when a file-level merge is necessary during `git merge`,
 987and other commands such as `git revert` and `git cherry-pick`.
 988
 989Set::
 990
 991        Built-in 3-way merge driver is used to merge the
 992        contents in a way similar to 'merge' command of `RCS`
 993        suite.  This is suitable for ordinary text files.
 994
 995Unset::
 996
 997        Take the version from the current branch as the
 998        tentative merge result, and declare that the merge has
 999        conflicts.  This is suitable for binary files that do
1000        not have a well-defined merge semantics.
1001
1002Unspecified::
1003
1004        By default, this uses the same built-in 3-way merge
1005        driver as is the case when the `merge` attribute is set.
1006        However, the `merge.default` configuration variable can name
1007        different merge driver to be used with paths for which the
1008        `merge` attribute is unspecified.
1009
1010String::
1011
1012        3-way merge is performed using the specified custom
1013        merge driver.  The built-in 3-way merge driver can be
1014        explicitly specified by asking for "text" driver; the
1015        built-in "take the current branch" driver can be
1016        requested with "binary".
1017
1018
1019Built-in merge drivers
1020^^^^^^^^^^^^^^^^^^^^^^
1021
1022There are a few built-in low-level merge drivers defined that
1023can be asked for via the `merge` attribute.
1024
1025text::
1026
1027        Usual 3-way file level merge for text files.  Conflicted
1028        regions are marked with conflict markers `<<<<<<<`,
1029        `=======` and `>>>>>>>`.  The version from your branch
1030        appears before the `=======` marker, and the version
1031        from the merged branch appears after the `=======`
1032        marker.
1033
1034binary::
1035
1036        Keep the version from your branch in the work tree, but
1037        leave the path in the conflicted state for the user to
1038        sort out.
1039
1040union::
1041
1042        Run 3-way file level merge for text files, but take
1043        lines from both versions, instead of leaving conflict
1044        markers.  This tends to leave the added lines in the
1045        resulting file in random order and the user should
1046        verify the result. Do not use this if you do not
1047        understand the implications.
1048
1049
1050Defining a custom merge driver
1051^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1052
1053The definition of a merge driver is done in the `.git/config`
1054file, not in the `gitattributes` file, so strictly speaking this
1055manual page is a wrong place to talk about it.  However...
1056
1057To define a custom merge driver `filfre`, add a section to your
1058`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
1059
1060----------------------------------------------------------------
1061[merge "filfre"]
1062        name = feel-free merge driver
1063        driver = filfre %O %A %B %L %P
1064        recursive = binary
1065----------------------------------------------------------------
1066
1067The `merge.*.name` variable gives the driver a human-readable
1068name.
1069
1070The `merge.*.driver` variable's value is used to construct a
1071command to run to merge ancestor's version (`%O`), current
1072version (`%A`) and the other branches' version (`%B`).  These
1073three tokens are replaced with the names of temporary files that
1074hold the contents of these versions when the command line is
1075built. Additionally, %L will be replaced with the conflict marker
1076size (see below).
1077
1078The merge driver is expected to leave the result of the merge in
1079the file named with `%A` by overwriting it, and exit with zero
1080status if it managed to merge them cleanly, or non-zero if there
1081were conflicts.
1082
1083The `merge.*.recursive` variable specifies what other merge
1084driver to use when the merge driver is called for an internal
1085merge between common ancestors, when there are more than one.
1086When left unspecified, the driver itself is used for both
1087internal merge and the final merge.
1088
1089The merge driver can learn the pathname in which the merged result
1090will be stored via placeholder `%P`.
1091
1092
1093`conflict-marker-size`
1094^^^^^^^^^^^^^^^^^^^^^^
1095
1096This attribute controls the length of conflict markers left in
1097the work tree file during a conflicted merge.  Only setting to
1098the value to a positive integer has any meaningful effect.
1099
1100For example, this line in `.gitattributes` can be used to tell the merge
1101machinery to leave much longer (instead of the usual 7-character-long)
1102conflict markers when merging the file `Documentation/git-merge.txt`
1103results in a conflict.
1104
1105------------------------
1106Documentation/git-merge.txt     conflict-marker-size=32
1107------------------------
1108
1109
1110Checking whitespace errors
1111~~~~~~~~~~~~~~~~~~~~~~~~~~
1112
1113`whitespace`
1114^^^^^^^^^^^^
1115
1116The `core.whitespace` configuration variable allows you to define what
1117'diff' and 'apply' should consider whitespace errors for all paths in
1118the project (See linkgit:git-config[1]).  This attribute gives you finer
1119control per path.
1120
1121Set::
1122
1123        Notice all types of potential whitespace errors known to Git.
1124        The tab width is taken from the value of the `core.whitespace`
1125        configuration variable.
1126
1127Unset::
1128
1129        Do not notice anything as error.
1130
1131Unspecified::
1132
1133        Use the value of the `core.whitespace` configuration variable to
1134        decide what to notice as error.
1135
1136String::
1137
1138        Specify a comma separate list of common whitespace problems to
1139        notice in the same format as the `core.whitespace` configuration
1140        variable.
1141
1142
1143Creating an archive
1144~~~~~~~~~~~~~~~~~~~
1145
1146`export-ignore`
1147^^^^^^^^^^^^^^^
1148
1149Files and directories with the attribute `export-ignore` won't be added to
1150archive files.
1151
1152`export-subst`
1153^^^^^^^^^^^^^^
1154
1155If the attribute `export-subst` is set for a file then Git will expand
1156several placeholders when adding this file to an archive.  The
1157expansion depends on the availability of a commit ID, i.e., if
1158linkgit:git-archive[1] has been given a tree instead of a commit or a
1159tag then no replacement will be done.  The placeholders are the same
1160as those for the option `--pretty=format:` of linkgit:git-log[1],
1161except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
1162in the file.  E.g. the string `$Format:%H$` will be replaced by the
1163commit hash.
1164
1165
1166Packing objects
1167~~~~~~~~~~~~~~~
1168
1169`delta`
1170^^^^^^^
1171
1172Delta compression will not be attempted for blobs for paths with the
1173attribute `delta` set to false.
1174
1175
1176Viewing files in GUI tools
1177~~~~~~~~~~~~~~~~~~~~~~~~~~
1178
1179`encoding`
1180^^^^^^^^^^
1181
1182The value of this attribute specifies the character encoding that should
1183be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to
1184display the contents of the relevant file. Note that due to performance
1185considerations linkgit:gitk[1] does not use this attribute unless you
1186manually enable per-file encodings in its options.
1187
1188If this attribute is not set or has an invalid value, the value of the
1189`gui.encoding` configuration variable is used instead
1190(See linkgit:git-config[1]).
1191
1192
1193USING MACRO ATTRIBUTES
1194----------------------
1195
1196You do not want any end-of-line conversions applied to, nor textual diffs
1197produced for, any binary file you track.  You would need to specify e.g.
1198
1199------------
1200*.jpg -text -diff
1201------------
1202
1203but that may become cumbersome, when you have many attributes.  Using
1204macro attributes, you can define an attribute that, when set, also
1205sets or unsets a number of other attributes at the same time.  The
1206system knows a built-in macro attribute, `binary`:
1207
1208------------
1209*.jpg binary
1210------------
1211
1212Setting the "binary" attribute also unsets the "text" and "diff"
1213attributes as above.  Note that macro attributes can only be "Set",
1214though setting one might have the effect of setting or unsetting other
1215attributes or even returning other attributes to the "Unspecified"
1216state.
1217
1218
1219DEFINING MACRO ATTRIBUTES
1220-------------------------
1221
1222Custom macro attributes can be defined only in top-level gitattributes
1223files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
1224top level of the working tree, or the global or system-wide
1225gitattributes files), not in `.gitattributes` files in working tree
1226subdirectories.  The built-in macro attribute "binary" is equivalent
1227to:
1228
1229------------
1230[attr]binary -diff -merge -text
1231------------
1232
1233
1234EXAMPLES
1235--------
1236
1237If you have these three `gitattributes` file:
1238
1239----------------------------------------------------------------
1240(in $GIT_DIR/info/attributes)
1241
1242a*      foo !bar -baz
1243
1244(in .gitattributes)
1245abc     foo bar baz
1246
1247(in t/.gitattributes)
1248ab*     merge=filfre
1249abc     -foo -bar
1250*.c     frotz
1251----------------------------------------------------------------
1252
1253the attributes given to path `t/abc` are computed as follows:
1254
12551. By examining `t/.gitattributes` (which is in the same
1256   directory as the path in question), Git finds that the first
1257   line matches.  `merge` attribute is set.  It also finds that
1258   the second line matches, and attributes `foo` and `bar`
1259   are unset.
1260
12612. Then it examines `.gitattributes` (which is in the parent
1262   directory), and finds that the first line matches, but
1263   `t/.gitattributes` file already decided how `merge`, `foo`
1264   and `bar` attributes should be given to this path, so it
1265   leaves `foo` and `bar` unset.  Attribute `baz` is set.
1266
12673. Finally it examines `$GIT_DIR/info/attributes`.  This file
1268   is used to override the in-tree settings.  The first line is
1269   a match, and `foo` is set, `bar` is reverted to unspecified
1270   state, and `baz` is unset.
1271
1272As the result, the attributes assignment to `t/abc` becomes:
1273
1274----------------------------------------------------------------
1275foo     set to true
1276bar     unspecified
1277baz     set to false
1278merge   set to string value "filfre"
1279frotz   unspecified
1280----------------------------------------------------------------
1281
1282
1283SEE ALSO
1284--------
1285linkgit:git-check-attr[1].
1286
1287GIT
1288---
1289Part of the linkgit:git[1] suite