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