Documentation / gitattributes.txton commit Merge branch 'maint' of git://repo.or.cz/git-gui into maint (e98d6df)
   1gitattributes(5)
   2================
   3
   4NAME
   5----
   6gitattributes - defining attributes per path
   7
   8SYNOPSIS
   9--------
  10$GIT_DIR/info/attributes, gitattributes
  11
  12
  13DESCRIPTION
  14-----------
  15
  16A `gitattributes` file is a simple text file that gives
  17`attributes` to pathnames.
  18
  19Each line in `gitattributes` file is of form:
  20
  21        glob    attr1 attr2 ...
  22
  23That is, a glob pattern followed by an attributes list,
  24separated by whitespaces.  When the glob pattern matches the
  25path in question, the attributes listed on the line are given to
  26the path.
  27
  28Each attribute can be in one of these states for a given path:
  29
  30Set::
  31
  32        The path has the attribute with special value "true";
  33        this is specified by listing only the name of the
  34        attribute in the attribute list.
  35
  36Unset::
  37
  38        The path has the attribute with special value "false";
  39        this is specified by listing the name of the attribute
  40        prefixed with a dash `-` in the attribute list.
  41
  42Set to a value::
  43
  44        The path has the attribute with specified string value;
  45        this is specified by listing the name of the attribute
  46        followed by an equal sign `=` and its value in the
  47        attribute list.
  48
  49Unspecified::
  50
  51        No glob pattern matches the path, and nothing says if
  52        the path has or does not have the attribute, the
  53        attribute for the path is said to be Unspecified.
  54
  55When more than one glob pattern matches the path, a later line
  56overrides an earlier line.  This overriding is done per
  57attribute.
  58
  59When deciding what attributes are assigned to a path, git
  60consults `$GIT_DIR/info/attributes` file (which has the highest
  61precedence), `.gitattributes` file in the same directory as the
  62path in question, and its parent directories (the further the
  63directory that contains `.gitattributes` is from the path in
  64question, the lower its precedence).
  65
  66Sometimes you would need to override an setting of an attribute
  67for a path to `unspecified` state.  This can be done by listing
  68the name of the attribute prefixed with an exclamation point `!`.
  69
  70
  71EFFECTS
  72-------
  73
  74Certain operations by git can be influenced by assigning
  75particular attributes to a path.  Currently, the following
  76operations are attributes-aware.
  77
  78Checking-out and checking-in
  79~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  80
  81These attributes affect how the contents stored in the
  82repository are copied to the working tree files when commands
  83such as `git checkout` and `git merge` run.  They also affect how
  84git stores the contents you prepare in the working tree in the
  85repository upon `git add` and `git commit`.
  86
  87`crlf`
  88^^^^^^
  89
  90This attribute controls the line-ending convention.
  91
  92Set::
  93
  94        Setting the `crlf` attribute on a path is meant to mark
  95        the path as a "text" file.  'core.autocrlf' conversion
  96        takes place without guessing the content type by
  97        inspection.
  98
  99Unset::
 100
 101        Unsetting the `crlf` attribute on a path is meant to
 102        mark the path as a "binary" file.  The path never goes
 103        through line endings conversion upon checkin/checkout.
 104
 105Unspecified::
 106
 107        Unspecified `crlf` attribute tells git to apply the
 108        `core.autocrlf` conversion when the file content looks
 109        like text.
 110
 111Set to string value "input"::
 112
 113        This is similar to setting the attribute to `true`, but
 114        also forces git to act as if `core.autocrlf` is set to
 115        `input` for the path.
 116
 117Any other value set to `crlf` attribute is ignored and git acts
 118as if the attribute is left unspecified.
 119
 120
 121The `core.autocrlf` conversion
 122^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 123
 124If the configuration variable `core.autocrlf` is false, no
 125conversion is done.
 126
 127When `core.autocrlf` is true, it means that the platform wants
 128CRLF line endings for files in the working tree, and you want to
 129convert them back to the normal LF line endings when checking
 130in to the repository.
 131
 132When `core.autocrlf` is set to "input", line endings are
 133converted to LF upon checkin, but there is no conversion done
 134upon checkout.
 135
 136
 137`ident`
 138^^^^^^^
 139
 140When the attribute `ident` is set to a path, git replaces
 141`$Id$` in the blob object with `$Id:`, followed by
 14240-character hexadecimal blob object name, followed by a dollar
 143sign `$` upon checkout.  Any byte sequence that begins with
 144`$Id:` and ends with `$` in the worktree file is replaced
 145with `$Id$` upon check-in.
 146
 147
 148`filter`
 149^^^^^^^^
 150
 151A `filter` attribute can be set to a string value that names a
 152filter driver specified in the configuration.
 153
 154A filter driver consists of a `clean` command and a `smudge`
 155command, either of which can be left unspecified.  Upon
 156checkout, when the `smudge` command is specified, the command is
 157fed the blob object from its standard input, and its standard
 158output is used to update the worktree file.  Similarly, the
 159`clean` command is used to convert the contents of worktree file
 160upon checkin.
 161
 162A missing filter driver definition in the config is not an error
 163but makes the filter a no-op passthru.
 164
 165The content filtering is done to massage the content into a
 166shape that is more convenient for the platform, filesystem, and
 167the user to use.  The key phrase here is "more convenient" and not
 168"turning something unusable into usable".  In other words, the
 169intent is that if someone unsets the filter driver definition,
 170or does not have the appropriate filter program, the project
 171should still be usable.
 172
 173
 174Interaction between checkin/checkout attributes
 175^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 176
 177In the check-in codepath, the worktree file is first converted
 178with `filter` driver (if specified and corresponding driver
 179defined), then the result is processed with `ident` (if
 180specified), and then finally with `crlf` (again, if specified
 181and applicable).
 182
 183In the check-out codepath, the blob content is first converted
 184with `crlf`, and then `ident` and fed to `filter`.
 185
 186
 187Generating diff text
 188~~~~~~~~~~~~~~~~~~~~
 189
 190The attribute `diff` affects if `git diff` generates textual
 191patch for the path or just says `Binary files differ`.  It also
 192can affect what line is shown on the hunk header `@@ -k,l +n,m @@`
 193line.
 194
 195Set::
 196
 197        A path to which the `diff` attribute is set is treated
 198        as text, even when they contain byte values that
 199        normally never appear in text files, such as NUL.
 200
 201Unset::
 202
 203        A path to which the `diff` attribute is unset will
 204        generate `Binary files differ`.
 205
 206Unspecified::
 207
 208        A path to which the `diff` attribute is unspecified
 209        first gets its contents inspected, and if it looks like
 210        text, it is treated as text.  Otherwise it would
 211        generate `Binary files differ`.
 212
 213String::
 214
 215        Diff is shown using the specified custom diff driver.
 216        The driver program is given its input using the same
 217        calling convention as used for GIT_EXTERNAL_DIFF
 218        program.  This name is also used for custom hunk header
 219        selection.
 220
 221
 222Defining a custom diff driver
 223^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 224
 225The definition of a diff driver is done in `gitconfig`, not
 226`gitattributes` file, so strictly speaking this manual page is a
 227wrong place to talk about it.  However...
 228
 229To define a custom diff driver `jcdiff`, add a section to your
 230`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 231
 232----------------------------------------------------------------
 233[diff "jcdiff"]
 234        command = j-c-diff
 235----------------------------------------------------------------
 236
 237When git needs to show you a diff for the path with `diff`
 238attribute set to `jcdiff`, it calls the command you specified
 239with the above configuration, i.e. `j-c-diff`, with 7
 240parameters, just like `GIT_EXTERNAL_DIFF` program is called.
 241See linkgit:git[7] for details.
 242
 243
 244Defining a custom hunk-header
 245^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 246
 247Each group of changes (called "hunk") in the textual diff output
 248is prefixed with a line of the form:
 249
 250        @@ -k,l +n,m @@ TEXT
 251
 252The text is called 'hunk header', and by default a line that
 253begins with an alphabet, an underscore or a dollar sign is used,
 254which matches what GNU `diff -p` output uses.  This default
 255selection however is not suited for some contents, and you can
 256use customized pattern to make a selection.
 257
 258First in .gitattributes, you would assign the `diff` attribute
 259for paths.
 260
 261------------------------
 262*.tex   diff=tex
 263------------------------
 264
 265Then, you would define "diff.tex.funcname" configuration to
 266specify a regular expression that matches a line that you would
 267want to appear as the hunk header, like this:
 268
 269------------------------
 270[diff "tex"]
 271        funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"
 272------------------------
 273
 274Note.  A single level of backslashes are eaten by the
 275configuration file parser, so you would need to double the
 276backslashes; the pattern above picks a line that begins with a
 277backslash, and zero or more occurrences of `sub` followed by
 278`section` followed by open brace, to the end of line.
 279
 280There are a few built-in patterns to make this easier, and `tex`
 281is one of them, so you do not have to write the above in your
 282configuration file (you still need to enable this with the
 283attribute mechanism, via `.gitattributes`).  Another built-in
 284pattern is defined for `java` that defines a pattern suitable
 285for program text in Java language.
 286
 287
 288Performing a three-way merge
 289~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 290
 291The attribute `merge` affects how three versions of a file is
 292merged when a file-level merge is necessary during `git merge`,
 293and other programs such as `git revert` and `git cherry-pick`.
 294
 295Set::
 296
 297        Built-in 3-way merge driver is used to merge the
 298        contents in a way similar to `merge` command of `RCS`
 299        suite.  This is suitable for ordinary text files.
 300
 301Unset::
 302
 303        Take the version from the current branch as the
 304        tentative merge result, and declare that the merge has
 305        conflicts.  This is suitable for binary files that does
 306        not have a well-defined merge semantics.
 307
 308Unspecified::
 309
 310        By default, this uses the same built-in 3-way merge
 311        driver as is the case the `merge` attribute is set.
 312        However, `merge.default` configuration variable can name
 313        different merge driver to be used for paths to which the
 314        `merge` attribute is unspecified.
 315
 316String::
 317
 318        3-way merge is performed using the specified custom
 319        merge driver.  The built-in 3-way merge driver can be
 320        explicitly specified by asking for "text" driver; the
 321        built-in "take the current branch" driver can be
 322        requested with "binary".
 323
 324
 325Built-in merge drivers
 326^^^^^^^^^^^^^^^^^^^^^^
 327
 328There are a few built-in low-level merge drivers defined that
 329can be asked for via the `merge` attribute.
 330
 331text::
 332
 333        Usual 3-way file level merge for text files.  Conflicted
 334        regions are marked with conflict markers `<<<<<<<`,
 335        `=======` and `>>>>>>>`.  The version from your branch
 336        appears before the `=======` marker, and the version
 337        from the merged branch appears after the `=======`
 338        marker.
 339
 340binary::
 341
 342        Keep the version from your branch in the work tree, but
 343        leave the path in the conflicted state for the user to
 344        sort out.
 345
 346union::
 347
 348        Run 3-way file level merge for text files, but take
 349        lines from both versions, instead of leaving conflict
 350        markers.  This tends to leave the added lines in the
 351        resulting file in random order and the user should
 352        verify the result. Do not use this if you do not
 353        understand the implications.
 354
 355
 356Defining a custom merge driver
 357^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 358
 359The definition of a merge driver is done in the `.git/config`
 360file, not in the `gitattributes` file, so strictly speaking this
 361manual page is a wrong place to talk about it.  However...
 362
 363To define a custom merge driver `filfre`, add a section to your
 364`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
 365
 366----------------------------------------------------------------
 367[merge "filfre"]
 368        name = feel-free merge driver
 369        driver = filfre %O %A %B
 370        recursive = binary
 371----------------------------------------------------------------
 372
 373The `merge.*.name` variable gives the driver a human-readable
 374name.
 375
 376The `merge.*.driver` variable's value is used to construct a
 377command to run to merge ancestor's version (`%O`), current
 378version (`%A`) and the other branches' version (`%B`).  These
 379three tokens are replaced with the names of temporary files that
 380hold the contents of these versions when the command line is
 381built.
 382
 383The merge driver is expected to leave the result of the merge in
 384the file named with `%A` by overwriting it, and exit with zero
 385status if it managed to merge them cleanly, or non-zero if there
 386were conflicts.
 387
 388The `merge.*.recursive` variable specifies what other merge
 389driver to use when the merge driver is called for an internal
 390merge between common ancestors, when there are more than one.
 391When left unspecified, the driver itself is used for both
 392internal merge and the final merge.
 393
 394
 395Checking whitespace errors
 396~~~~~~~~~~~~~~~~~~~~~~~~~~
 397
 398`whitespace`
 399^^^^^^^^^^^^
 400
 401The `core.whitespace` configuration variable allows you to define what
 402`diff` and `apply` should consider whitespace errors for all paths in
 403the project (See linkgit:git-config[1]).  This attribute gives you finer
 404control per path.
 405
 406Set::
 407
 408        Notice all types of potential whitespace errors known to git.
 409
 410Unset::
 411
 412        Do not notice anything as error.
 413
 414Unspecified::
 415
 416        Use the value of `core.whitespace` configuration variable to
 417        decide what to notice as error.
 418
 419String::
 420
 421        Specify a comma separate list of common whitespace problems to
 422        notice in the same format as `core.whitespace` configuration
 423        variable.
 424
 425
 426EXAMPLE
 427-------
 428
 429If you have these three `gitattributes` file:
 430
 431----------------------------------------------------------------
 432(in $GIT_DIR/info/attributes)
 433
 434a*      foo !bar -baz
 435
 436(in .gitattributes)
 437abc     foo bar baz
 438
 439(in t/.gitattributes)
 440ab*     merge=filfre
 441abc     -foo -bar
 442*.c     frotz
 443----------------------------------------------------------------
 444
 445the attributes given to path `t/abc` are computed as follows:
 446
 4471. By examining `t/.gitattributes` (which is in the same
 448   directory as the path in question), git finds that the first
 449   line matches.  `merge` attribute is set.  It also finds that
 450   the second line matches, and attributes `foo` and `bar`
 451   are unset.
 452
 4532. Then it examines `.gitattributes` (which is in the parent
 454   directory), and finds that the first line matches, but
 455   `t/.gitattributes` file already decided how `merge`, `foo`
 456   and `bar` attributes should be given to this path, so it
 457   leaves `foo` and `bar` unset.  Attribute `baz` is set.
 458
 4593. Finally it examines `$GIT_DIR/info/attributes`.  This file
 460   is used to override the in-tree settings.  The first line is
 461   a match, and `foo` is set, `bar` is reverted to unspecified
 462   state, and `baz` is unset.
 463
 464As the result, the attributes assignment to `t/abc` becomes:
 465
 466----------------------------------------------------------------
 467foo     set to true
 468bar     unspecified
 469baz     set to false
 470merge   set to string value "filfre"
 471frotz   unspecified
 472----------------------------------------------------------------
 473
 474
 475Creating an archive
 476~~~~~~~~~~~~~~~~~~~
 477
 478`export-subst`
 479^^^^^^^^^^^^^^
 480
 481If the attribute `export-subst` is set for a file then git will expand
 482several placeholders when adding this file to an archive.  The
 483expansion depends on the availability of a commit ID, i.e. if
 484linkgit:git-archive[1] has been given a tree instead of a commit or a
 485tag then no replacement will be done.  The placeholders are the same
 486as those for the option `--pretty=format:` of linkgit:git-log[1],
 487except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
 488in the file.  E.g. the string `$Format:%H$` will be replaced by the
 489commit hash.
 490
 491
 492GIT
 493---
 494Part of the linkgit:git[7] suite