blob: 7aff94020243a02a7785e4890cf99b71d039884d [file] [log] [blame]
Junio C Hamano88e7fdf2007-04-19 20:48:03 -07001gitattributes(5)
2================
3
4NAME
5----
6gitattributes - defining attributes per path
7
8SYNOPSIS
9--------
Gustaf Hendebye5b5c1d2008-08-31 18:00:27 +020010$GIT_DIR/info/attributes, .gitattributes
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070011
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
Johannes Sixt3f74c8e2009-02-25 08:54:42 +010021 pattern attr1 attr2 ...
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070022
Johannes Sixt3f74c8e2009-02-25 08:54:42 +010023That is, a pattern followed by an attributes list,
24separated by whitespaces. When the pattern matches the
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070025path 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
Johannes Sixt3f74c8e2009-02-25 08:54:42 +010051 No pattern matches the path, and nothing says if
Junio C Hamanob9d14ff2007-04-24 13:46:02 -070052 the path has or does not have the attribute, the
53 attribute for the path is said to be Unspecified.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070054
Johannes Sixt3f74c8e2009-02-25 08:54:42 +010055When more than one pattern matches the path, a later line
Junio C Hamanob9d14ff2007-04-24 13:46:02 -070056overrides an earlier line. This overriding is done per
Johannes Sixt3f74c8e2009-02-25 08:54:42 +010057attribute. The rules how the pattern matches paths are the
58same as in `.gitignore` files; see linkgit:gitignore[5].
Nguyễn Thái Ngọc Duy82dce992012-10-15 13:24:39 +070059Unlike `.gitignore`, negative patterns are forbidden.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070060
Thomas Ackermann2de9b712013-01-21 20:17:53 +010061When deciding what attributes are assigned to a path, Git
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070062consults `$GIT_DIR/info/attributes` file (which has the highest
63precedence), `.gitattributes` file in the same directory as the
Jason Merrill20ff3ec2009-04-06 11:03:36 -040064path in question, and its parent directories up to the toplevel of the
65work tree (the further the directory that contains `.gitattributes`
Petr Onderka6df42ab2010-09-01 00:42:43 +020066is from the path in question, the lower its precedence). Finally
67global and system-wide files are considered (they have the lowest
68precedence).
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070069
Nguyen Thai Ngoc Duy40701ad2012-10-10 20:55:52 +070070When the `.gitattributes` file is missing from the work tree, the
71path in the index is used as a fall-back. During checkout process,
72`.gitattributes` in the index is used and then the file in the
73working tree is used as a fall-back.
74
Jeff King90b22902008-03-27 01:31:00 -040075If you wish to affect only a single repository (i.e., to assign
Petr Onderka6df42ab2010-09-01 00:42:43 +020076attributes to files that are particular to
77one user's workflow for that repository), then
Jeff King90b22902008-03-27 01:31:00 -040078attributes should be placed in the `$GIT_DIR/info/attributes` file.
79Attributes which should be version-controlled and distributed to other
80repositories (i.e., attributes of interest to all users) should go into
Petr Onderka6df42ab2010-09-01 00:42:43 +020081`.gitattributes` files. Attributes that should affect all repositories
82for a single user should be placed in a file specified by the
Nguyễn Thái Ngọc Duyda0005b2015-03-11 16:32:45 -040083`core.attributesFile` configuration option (see linkgit:git-config[1]).
Huynh Khoi Nguyen Nguyen684e40f2012-06-22 11:03:25 +020084Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
85is either not set or empty, $HOME/.config/git/attributes is used instead.
Petr Onderka6df42ab2010-09-01 00:42:43 +020086Attributes for all users on a system should be placed in the
87`$(prefix)/etc/gitattributes` file.
Jeff King90b22902008-03-27 01:31:00 -040088
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070089Sometimes you would need to override an setting of an attribute
Michael Haggerty09225702011-08-03 15:41:30 +020090for a path to `Unspecified` state. This can be done by listing
Junio C Hamano88e7fdf2007-04-19 20:48:03 -070091the name of the attribute prefixed with an exclamation point `!`.
92
93
94EFFECTS
95-------
96
Thomas Ackermann2de9b712013-01-21 20:17:53 +010097Certain operations by Git can be influenced by assigning
Junio C Hamanoae7aa492007-07-08 17:15:09 -070098particular attributes to a path. Currently, the following
99operations are attributes-aware.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700100
101Checking-out and checking-in
102~~~~~~~~~~~~~~~~~~~~~~~~~~~~
103
Junio C Hamano3fed15f2007-04-21 19:09:02 -0700104These attributes affect how the contents stored in the
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700105repository are copied to the working tree files when commands
Thomas Rast0b444cd2010-01-10 00:33:00 +0100106such as 'git checkout' and 'git merge' run. They also affect how
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100107Git stores the contents you prepare in the working tree in the
Thomas Rast0b444cd2010-01-10 00:33:00 +0100108repository upon 'git add' and 'git commit'.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700109
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200110`text`
Junio C Hamano3fed15f2007-04-21 19:09:02 -0700111^^^^^^
112
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200113This attribute enables and controls end-of-line normalization. When a
114text file is normalized, its line endings are converted to LF in the
115repository. To control what line ending style is used in the working
116directory, use the `eol` attribute for a single file and the
Eyvind Bernhardsen942e7742010-06-04 21:29:08 +0200117`core.eol` configuration variable for all text files.
Torsten Bögershausen65237282016-06-28 10:01:13 +0200118Note that `core.autocrlf` overrides `core.eol`
Junio C Hamano3fed15f2007-04-21 19:09:02 -0700119
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700120Set::
121
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200122 Setting the `text` attribute on a path enables end-of-line
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200123 normalization and marks the path as a text file. End-of-line
124 conversion takes place without guessing the content type.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700125
126Unset::
127
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100128 Unsetting the `text` attribute on a path tells Git not to
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700129 attempt any end-of-line conversion upon checkin or checkout.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700130
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200131Set to string value "auto"::
132
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200133 When `text` is set to "auto", the path is marked for automatic
Torsten Bögershausen65237282016-06-28 10:01:13 +0200134 end-of-line conversion. If Git decides that the content is
135 text, its line endings are converted to LF on checkin.
Ville Skyttä2e3a16b2016-08-09 11:53:38 +0300136 When the file has been committed with CRLF, no conversion is done.
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200137
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700138Unspecified::
139
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100140 If the `text` attribute is unspecified, Git uses the
Eyvind Bernhardsen942e7742010-06-04 21:29:08 +0200141 `core.autocrlf` configuration variable to determine if the
142 file should be converted.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700143
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100144Any other value causes Git to act as if `text` has been left
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200145unspecified.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700146
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200147`eol`
148^^^^^
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700149
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200150This attribute sets a specific line-ending style to be used in the
Torsten Bögershausen65237282016-06-28 10:01:13 +0200151working directory. It enables end-of-line conversion without any
Eyvind Bernhardsen942e7742010-06-04 21:29:08 +0200152content checks, effectively setting the `text` attribute.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700153
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200154Set to string value "crlf"::
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700155
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100156 This setting forces Git to normalize line endings for this
Eyvind Bernhardsen942e7742010-06-04 21:29:08 +0200157 file on checkin and convert them to CRLF when the file is
158 checked out.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700159
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200160Set to string value "lf"::
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700161
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100162 This setting forces Git to normalize line endings to LF on
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200163 checkin and prevents conversion to CRLF when the file is
Eyvind Bernhardsen942e7742010-06-04 21:29:08 +0200164 checked out.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700165
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200166Backwards compatibility with `crlf` attribute
167^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
168
169For backwards compatibility, the `crlf` attribute is interpreted as
170follows:
171
172------------------------
173crlf text
174-crlf -text
175crlf=input eol=lf
176------------------------
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700177
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200178End-of-line conversion
179^^^^^^^^^^^^^^^^^^^^^^
180
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100181While Git normally leaves file contents alone, it can be configured to
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200182normalize line endings to LF in the repository and, optionally, to
183convert them to CRLF when files are checked out.
184
Torsten Bögershausene28eae32016-08-26 22:18:48 +0200185If you simply want to have CRLF line endings in your working directory
186regardless of the repository you are working with, you can set the
187config variable "core.autocrlf" without using any attributes.
188
189------------------------
190[core]
191 autocrlf = true
192------------------------
193
194This does not force normalization of text files, but does ensure
195that text files that you introduce to the repository have their line
196endings normalized to LF when they are added, and that files that are
197already normalized in the repository stay normalized.
198
199If you want to ensure that text files that any contributor introduces to
200the repository have their line endings normalized, you can set the
201`text` attribute to "auto" for _all_ files.
202
203------------------------
204* text=auto
205------------------------
206
207The attributes allow a fine-grained control, how the line endings
208are converted.
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100209Here is an example that will make Git normalize .txt, .vcproj and .sh
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200210files, ensure that .vcproj files have CRLF and .sh files have LF in
211the working directory, and prevent .jpg files from being normalized
212regardless of their content.
213
214------------------------
Torsten Bögershausen65237282016-06-28 10:01:13 +0200215* text=auto
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200216*.txt text
Torsten Bögershausen65237282016-06-28 10:01:13 +0200217*.vcproj text eol=crlf
218*.sh text eol=lf
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200219*.jpg -text
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200220------------------------
221
Torsten Bögershausene28eae32016-08-26 22:18:48 +0200222NOTE: When `text=auto` conversion is enabled in a cross-platform
223project using push and pull to a central repository the text files
224containing CRLFs should be normalized.
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200225
Torsten Bögershausene28eae32016-08-26 22:18:48 +0200226From a clean working directory:
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200227
228-------------------------------------------------
Torsten Bögershausene28eae32016-08-26 22:18:48 +0200229$ echo "* text=auto" >.gitattributes
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100230$ rm .git/index # Remove the index to force Git to
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200231$ git reset # re-scan the working directory
232$ git status # Show files that will be normalized
233$ git add -u
234$ git add .gitattributes
235$ git commit -m "Introduce end-of-line normalization"
236-------------------------------------------------
237
238If any files that should not be normalized show up in 'git status',
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200239unset their `text` attribute before running 'git add -u'.
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200240
241------------------------
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200242manual.pdf -text
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200243------------------------
244
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100245Conversely, text files that Git does not detect can have normalization
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200246enabled manually.
247
248------------------------
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200249weirdchars.txt text
Eyvind Bernhardsenfd6cce92010-05-19 22:43:10 +0200250------------------------
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700251
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100252If `core.safecrlf` is set to "true" or "warn", Git verifies if
Steffen Prohaska21e5ad52008-02-06 12:25:58 +0100253the conversion is reversible for the current setting of
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100254`core.autocrlf`. For "true", Git rejects irreversible
255conversions; for "warn", Git only prints a warning but accepts
Steffen Prohaska21e5ad52008-02-06 12:25:58 +0100256an irreversible conversion. The safety triggers to prevent such
257a conversion done to the files in the work tree, but there are a
258few exceptions. Even though...
259
Thomas Rast0b444cd2010-01-10 00:33:00 +0100260- 'git add' itself does not touch the files in the work tree, the
Steffen Prohaska21e5ad52008-02-06 12:25:58 +0100261 next checkout would, so the safety triggers;
262
Thomas Rast0b444cd2010-01-10 00:33:00 +0100263- 'git apply' to update a text file with a patch does touch the files
Steffen Prohaska21e5ad52008-02-06 12:25:58 +0100264 in the work tree, but the operation is about text files and CRLF
265 conversion is about fixing the line ending inconsistencies, so the
266 safety does not trigger;
267
Thomas Rast0b444cd2010-01-10 00:33:00 +0100268- 'git diff' itself does not touch the files in the work tree, it is
269 often run to inspect the changes you intend to next 'git add'. To
Steffen Prohaska21e5ad52008-02-06 12:25:58 +0100270 catch potential problems early, safety triggers.
271
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700272
Junio C Hamano3fed15f2007-04-21 19:09:02 -0700273`ident`
274^^^^^^^
275
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100276When the attribute `ident` is set for a path, Git replaces
Jan Krüger2c850f12008-10-30 19:14:33 +0100277`$Id$` in the blob object with `$Id:`, followed by the
Junio C Hamano3fed15f2007-04-21 19:09:02 -070027840-character hexadecimal blob object name, followed by a dollar
279sign `$` upon checkout. Any byte sequence that begins with
Andy Parkinsaf9b54b2007-05-14 14:37:25 +0100280`$Id:` and ends with `$` in the worktree file is replaced
281with `$Id$` upon check-in.
Junio C Hamano3fed15f2007-04-21 19:09:02 -0700282
283
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700284`filter`
285^^^^^^^^
286
Wincent Colaiutac05ef932007-11-14 08:51:41 +0100287A `filter` attribute can be set to a string value that names a
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700288filter driver specified in the configuration.
289
Wincent Colaiutac05ef932007-11-14 08:51:41 +0100290A filter driver consists of a `clean` command and a `smudge`
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700291command, either of which can be left unspecified. Upon
Wincent Colaiutac05ef932007-11-14 08:51:41 +0100292checkout, when the `smudge` command is specified, the command is
293fed the blob object from its standard input, and its standard
294output is used to update the worktree file. Similarly, the
295`clean` command is used to convert the contents of worktree file
296upon checkin.
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700297
Jehan Bing36daaac2012-02-16 17:19:03 -0800298One use of the content filtering is to massage the content into a shape
299that is more convenient for the platform, filesystem, and the user to use.
300For this mode of operation, the key phrase here is "more convenient" and
301not "turning something unusable into usable". In other words, the intent
302is that if someone unsets the filter driver definition, or does not have
303the appropriate filter program, the project should still be usable.
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700304
Jehan Bing36daaac2012-02-16 17:19:03 -0800305Another use of the content filtering is to store the content that cannot
306be directly used in the repository (e.g. a UUID that refers to the true
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100307content stored outside Git, or an encrypted content) and turn it into a
Jehan Bing36daaac2012-02-16 17:19:03 -0800308usable form upon checkout (e.g. download the external content, or decrypt
309the encrypted content).
310
311These two filters behave differently, and by default, a filter is taken as
312the former, massaging the contents into more convenient shape. A missing
313filter driver definition in the config, or a filter driver that exits with
314a non-zero status, is not an error but makes the filter a no-op passthru.
315
316You can declare that a filter turns a content that by itself is unusable
317into a usable content by setting the filter.<driver>.required configuration
318variable to `true`.
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700319
Nanako Shiraishid79f5d12009-12-15 12:11:10 +0900320For example, in .gitattributes, you would assign the `filter`
321attribute for paths.
322
323------------------------
324*.c filter=indent
325------------------------
326
327Then you would define a "filter.indent.clean" and "filter.indent.smudge"
328configuration in your .git/config to specify a pair of commands to
329modify the contents of C programs when the source files are checked
330in ("clean" is run) and checked out (no change is made because the
331command is "cat").
332
333------------------------
334[filter "indent"]
335 clean = indent
336 smudge = cat
337------------------------
338
Eyvind Bernhardsenf217f0e2010-07-02 21:20:47 +0200339For best results, `clean` should not alter its output further if it is
340run twice ("clean->clean" should be equivalent to "clean"), and
341multiple `smudge` commands should not alter `clean`'s output
342("smudge->smudge->clean" should be equivalent to "clean"). See the
343section on merging below.
344
345The "indent" filter is well-behaved in this regard: it will not modify
346input that is already correctly indented. In this case, the lack of a
347smudge filter means that the clean filter _must_ accept its own output
348without modifying it.
349
Jehan Bing36daaac2012-02-16 17:19:03 -0800350If a filter _must_ succeed in order to make the stored contents usable,
351you can declare that the filter is `required`, in the configuration:
352
353------------------------
354[filter "crypt"]
355 clean = openssl enc ...
356 smudge = openssl enc -d ...
357 required
358------------------------
359
Pete Wyckoffa2b665d2010-12-22 06:40:13 -0800360Sequence "%f" on the filter command line is replaced with the name of
361the file the filter is working on. A filter might use this in keyword
362substitution. For example:
363
364------------------------
365[filter "p4"]
366 clean = git-p4-filter --clean %f
367 smudge = git-p4-filter --smudge %f
368------------------------
369
Joey Hess52db4b02016-07-11 18:45:05 -0400370Note that "%f" is the name of the path that is being worked on. Depending
371on the version that is being filtered, the corresponding file on disk may
372not exist, or may have different contents. So, smudge and clean commands
373should not try to access the file on disk, but only act as filters on the
374content provided to them on standard input.
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700375
376Interaction between checkin/checkout attributes
377^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
378
379In the check-in codepath, the worktree file is first converted
380with `filter` driver (if specified and corresponding driver
381defined), then the result is processed with `ident` (if
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200382specified), and then finally with `text` (again, if specified
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700383and applicable).
384
385In the check-out codepath, the blob content is first converted
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200386with `text`, and then `ident` and fed to `filter`.
Junio C Hamanoaa4ed402007-04-21 03:14:13 -0700387
388
Eyvind Bernhardsenf217f0e2010-07-02 21:20:47 +0200389Merging branches with differing checkin/checkout attributes
390^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
391
392If you have added attributes to a file that cause the canonical
393repository format for that file to change, such as adding a
394clean/smudge filter or text/eol/ident attributes, merging anything
395where the attribute is not in place would normally cause merge
396conflicts.
397
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100398To prevent these unnecessary merge conflicts, Git can be told to run a
Eyvind Bernhardsenf217f0e2010-07-02 21:20:47 +0200399virtual check-out and check-in of all three stages of a file when
400resolving a three-way merge by setting the `merge.renormalize`
401configuration variable. This prevents changes caused by check-in
402conversion from causing spurious merge conflicts when a converted file
403is merged with an unconverted file.
404
405As long as a "smudge->clean" results in the same output as a "clean"
406even on files that are already smudged, this strategy will
407automatically resolve all filter-related conflicts. Filters that do
408not act in this way may cause additional merge conflicts that must be
409resolved manually.
410
411
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700412Generating diff text
413~~~~~~~~~~~~~~~~~~~~
414
Jakub Narebski4f73e242008-11-01 06:24:55 +0000415`diff`
416^^^^^^
417
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100418The attribute `diff` affects how Git generates diffs for particular
419files. It can tell Git whether to generate a textual patch for the path
Jeff King678852d2008-10-26 00:41:52 -0400420or to treat the path as a binary file. It can also affect what line is
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100421shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an
422external command to generate the diff, or ask Git to convert binary
Jeff King678852d2008-10-26 00:41:52 -0400423files to a text format before generating the diff.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700424
425Set::
426
427 A path to which the `diff` attribute is set is treated
428 as text, even when they contain byte values that
429 normally never appear in text files, such as NUL.
430
431Unset::
432
433 A path to which the `diff` attribute is unset will
Jeff King678852d2008-10-26 00:41:52 -0400434 generate `Binary files differ` (or a binary patch, if
435 binary patches are enabled).
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700436
437Unspecified::
438
439 A path to which the `diff` attribute is unspecified
440 first gets its contents inspected, and if it looks like
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +0700441 text and is smaller than core.bigFileThreshold, it is treated
442 as text. Otherwise it would generate `Binary files differ`.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700443
Junio C Hamano2cc31672007-04-23 00:21:02 -0700444String::
445
Jeff King678852d2008-10-26 00:41:52 -0400446 Diff is shown using the specified diff driver. Each driver may
447 specify one or more options, as described in the following
448 section. The options for the diff driver "foo" are defined
449 by the configuration variables in the "diff.foo" section of the
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100450 Git config file.
Junio C Hamano2cc31672007-04-23 00:21:02 -0700451
452
Jeff King678852d2008-10-26 00:41:52 -0400453Defining an external diff driver
454^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Junio C Hamano2cc31672007-04-23 00:21:02 -0700455
456The definition of a diff driver is done in `gitconfig`, not
457`gitattributes` file, so strictly speaking this manual page is a
458wrong place to talk about it. However...
459
Jeff King678852d2008-10-26 00:41:52 -0400460To define an external diff driver `jcdiff`, add a section to your
Junio C Hamano2cc31672007-04-23 00:21:02 -0700461`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
462
463----------------------------------------------------------------
464[diff "jcdiff"]
465 command = j-c-diff
466----------------------------------------------------------------
467
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100468When Git needs to show you a diff for the path with `diff`
Junio C Hamano2cc31672007-04-23 00:21:02 -0700469attribute set to `jcdiff`, it calls the command you specified
470with the above configuration, i.e. `j-c-diff`, with 7
471parameters, just like `GIT_EXTERNAL_DIFF` program is called.
Christian Couder9e1f0a82008-06-06 09:07:32 +0200472See linkgit:git[1] for details.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700473
474
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700475Defining a custom hunk-header
476^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
477
Garry Dolleyc882c012008-09-16 23:20:39 -0700478Each group of changes (called a "hunk") in the textual diff output
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700479is prefixed with a line of the form:
480
481 @@ -k,l +n,m @@ TEXT
482
Garry Dolleyc882c012008-09-16 23:20:39 -0700483This is called a 'hunk header'. The "TEXT" portion is by default a line
484that begins with an alphabet, an underscore or a dollar sign; this
485matches what GNU 'diff -p' output uses. This default selection however
486is not suited for some contents, and you can use a customized pattern
487to make a selection.
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700488
Garry Dolleyc882c012008-09-16 23:20:39 -0700489First, in .gitattributes, you would assign the `diff` attribute
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700490for paths.
491
492------------------------
493*.tex diff=tex
494------------------------
495
Shawn O. Pearceedb7e822008-09-29 10:23:19 -0700496Then, you would define a "diff.tex.xfuncname" configuration to
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700497specify a regular expression that matches a line that you would
Jeff Kingc4c86d22009-04-16 03:17:12 -0400498want to appear as the hunk header "TEXT". Add a section to your
499`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700500
501------------------------
502[diff "tex"]
Brandon Casey45d94142008-09-18 17:44:33 -0500503 xfuncname = "^(\\\\(sub)*section\\{.*)$"
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700504------------------------
505
506Note. A single level of backslashes are eaten by the
507configuration file parser, so you would need to double the
508backslashes; the pattern above picks a line that begins with a
Brian Hetro02783072007-08-23 20:44:13 -0400509backslash, and zero or more occurrences of `sub` followed by
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700510`section` followed by open brace, to the end of line.
511
512There are a few built-in patterns to make this easier, and `tex`
513is one of them, so you do not have to write the above in your
514configuration file (you still need to enable this with the
Gustaf Hendebyd08ed6d2008-08-12 16:24:25 +0200515attribute mechanism, via `.gitattributes`). The following built in
516patterns are available:
517
Adrian Johnsone90d0652012-09-16 13:24:15 +0930518- `ada` suitable for source code in the Ada language.
519
Gustaf Hendeby23b5beb2008-08-12 16:24:26 +0200520- `bibtex` suitable for files with BibTeX coded references.
521
Thomas Rast80c49c32009-01-17 17:29:48 +0100522- `cpp` suitable for source code in the C and C++ languages.
523
Petr Onderkab2212072010-08-16 17:01:02 +0000524- `csharp` suitable for source code in the C# language.
525
William Duclot0719f3e2016-06-03 14:32:26 +0200526- `css` suitable for cascading style sheets.
527
Brandon Casey909a5492010-09-10 11:18:14 -0500528- `fortran` suitable for source code in the Fortran language.
529
Zoë Blade69f9c872015-07-21 14:22:46 +0100530- `fountain` suitable for Fountain documents.
531
Andreas Ericssonaf9ce1f2008-09-07 22:15:29 +0200532- `html` suitable for HTML/XHTML documents.
533
Ralf Wildenhuesb66e00f2008-09-12 21:10:26 +0200534- `java` suitable for source code in the Java language.
Gustaf Hendebyd08ed6d2008-08-12 16:24:25 +0200535
Gustaf Hendeby53b10a12011-11-15 21:15:03 +0100536- `matlab` suitable for source code in the MATLAB language.
537
Jonathan del Strother5d1e9582008-10-01 00:46:34 +0100538- `objc` suitable for source code in the Objective-C language.
539
Gustaf Hendebyd08ed6d2008-08-12 16:24:25 +0200540- `pascal` suitable for source code in the Pascal/Delphi language.
541
Jonathan Nieder71a5d4b2010-12-26 03:07:31 -0600542- `perl` suitable for source code in the Perl language.
543
Andreas Ericssonaf9ce1f2008-09-07 22:15:29 +0200544- `php` suitable for source code in the PHP language.
545
Kirill Smelkov7c172052008-08-20 19:57:07 +0400546- `python` suitable for source code in the Python language.
547
Gustaf Hendebyd08ed6d2008-08-12 16:24:25 +0200548- `ruby` suitable for source code in the Ruby language.
549
550- `tex` suitable for source code for LaTeX documents.
Junio C Hamanoae7aa492007-07-08 17:15:09 -0700551
552
Thomas Rast80c49c32009-01-17 17:29:48 +0100553Customizing word diff
554^^^^^^^^^^^^^^^^^^^^^
555
Thomas Rast882749a2010-04-14 17:59:06 +0200556You can customize the rules that `git diff --word-diff` uses to
Thomas Rast80c49c32009-01-17 17:29:48 +0100557split words in a line, by specifying an appropriate regular expression
Boyd Stephen Smith Jrae3b9702009-01-20 22:59:54 -0600558in the "diff.*.wordRegex" configuration variable. For example, in TeX
Thomas Rast80c49c32009-01-17 17:29:48 +0100559a backslash followed by a sequence of letters forms a command, but
560several such commands can be run together without intervening
Jeff Kingc4c86d22009-04-16 03:17:12 -0400561whitespace. To separate them, use a regular expression in your
562`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
Thomas Rast80c49c32009-01-17 17:29:48 +0100563
564------------------------
565[diff "tex"]
Boyd Stephen Smith Jrae3b9702009-01-20 22:59:54 -0600566 wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
Thomas Rast80c49c32009-01-17 17:29:48 +0100567------------------------
568
569A built-in pattern is provided for all languages listed in the
570previous section.
571
572
Jeff King678852d2008-10-26 00:41:52 -0400573Performing text diffs of binary files
574^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
575
576Sometimes it is desirable to see the diff of a text-converted
577version of some binary files. For example, a word processor
578document can be converted to an ASCII text representation, and
579the diff of the text shown. Even though this conversion loses
580some information, the resulting diff is useful for human
581viewing (but cannot be applied directly).
582
583The `textconv` config option is used to define a program for
584performing such a conversion. The program should take a single
585argument, the name of a file to convert, and produce the
586resulting text on stdout.
587
588For example, to show the diff of the exif information of a
589file instead of the binary information (assuming you have the
Jeff Kingc4c86d22009-04-16 03:17:12 -0400590exif tool installed), add the following section to your
591`$GIT_DIR/config` file (or `$HOME/.gitconfig` file):
Jeff King678852d2008-10-26 00:41:52 -0400592
593------------------------
594[diff "jpg"]
595 textconv = exif
596------------------------
597
598NOTE: The text conversion is generally a one-way conversion;
599in this example, we lose the actual image contents and focus
600just on the text data. This means that diffs generated by
601textconv are _not_ suitable for applying. For this reason,
602only `git diff` and the `git log` family of commands (i.e.,
603log, whatchanged, show) will perform text conversion. `git
604format-patch` will never generate this output. If you want to
605send somebody a text-converted diff of a binary file (e.g.,
606because it quickly conveys the changes you have made), you
607should generate it separately and send it as a comment _in
608addition to_ the usual binary diff that you might send.
609
Jeff Kingd9bae1a2010-04-01 20:12:15 -0400610Because text conversion can be slow, especially when doing a
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100611large number of them with `git log -p`, Git provides a mechanism
Jeff Kingd9bae1a2010-04-01 20:12:15 -0400612to cache the output and use it in future diffs. To enable
613caching, set the "cachetextconv" variable in your diff driver's
614config. For example:
615
616------------------------
617[diff "jpg"]
618 textconv = exif
619 cachetextconv = true
620------------------------
621
622This will cache the result of running "exif" on each blob
623indefinitely. If you change the textconv config variable for a
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100624diff driver, Git will automatically invalidate the cache entries
Jeff Kingd9bae1a2010-04-01 20:12:15 -0400625and re-run the textconv filter. If you want to invalidate the
626cache manually (e.g., because your version of "exif" was updated
627and now produces better output), you can remove the cache
628manually with `git update-ref -d refs/notes/textconv/jpg` (where
629"jpg" is the name of the diff driver, as in the example above).
Jeff King678852d2008-10-26 00:41:52 -0400630
Jeff King55601c62011-05-24 15:45:27 -0400631Choosing textconv versus external diff
632^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
633
634If you want to show differences between binary or specially-formatted
635blobs in your repository, you can choose to use either an external diff
636command, or to use textconv to convert them to a diff-able text format.
637Which method you choose depends on your exact situation.
638
639The advantage of using an external diff command is flexibility. You are
640not bound to find line-oriented changes, nor is it necessary for the
641output to resemble unified diff. You are free to locate and report
642changes in the most appropriate way for your data format.
643
644A textconv, by comparison, is much more limiting. You provide a
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100645transformation of the data into a line-oriented text format, and Git
Jeff King55601c62011-05-24 15:45:27 -0400646uses its regular diff tools to generate the output. There are several
647advantages to choosing this method:
648
6491. Ease of use. It is often much simpler to write a binary to text
650 transformation than it is to perform your own diff. In many cases,
651 existing programs can be used as textconv filters (e.g., exif,
652 odt2txt).
653
6542. Git diff features. By performing only the transformation step
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100655 yourself, you can still utilize many of Git's diff features,
Jeff King55601c62011-05-24 15:45:27 -0400656 including colorization, word-diff, and combined diffs for merges.
657
6583. Caching. Textconv caching can speed up repeated diffs, such as those
659 you might trigger by running `git log -p`.
660
661
Jeff Kingab435612011-01-09 15:10:04 -0500662Marking files as binary
663^^^^^^^^^^^^^^^^^^^^^^^
664
665Git usually guesses correctly whether a blob contains text or binary
666data by examining the beginning of the contents. However, sometimes you
667may want to override its decision, either because a blob contains binary
668data later in the file, or because the content, while technically
669composed of text characters, is opaque to a human reader. For example,
Thomas Ackermannf745acb2014-11-03 21:37:07 +0100670many postscript files contain only ASCII characters, but produce noisy
Jeff Kingab435612011-01-09 15:10:04 -0500671and meaningless diffs.
672
673The simplest way to mark a file as binary is to unset the diff
674attribute in the `.gitattributes` file:
675
676------------------------
677*.ps -diff
678------------------------
679
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100680This will cause Git to generate `Binary files differ` (or a binary
Jeff Kingab435612011-01-09 15:10:04 -0500681patch, if binary patches are enabled) instead of a regular diff.
682
683However, one may also want to specify other diff driver attributes. For
684example, you might want to use `textconv` to convert postscript files to
Thomas Ackermannf745acb2014-11-03 21:37:07 +0100685an ASCII representation for human viewing, but otherwise treat them as
Jeff Kingab435612011-01-09 15:10:04 -0500686binary files. You cannot specify both `-diff` and `diff=ps` attributes.
687The solution is to use the `diff.*.binary` config option:
688
689------------------------
690[diff "ps"]
691 textconv = ps2ascii
692 binary = true
693------------------------
694
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700695Performing a three-way merge
696~~~~~~~~~~~~~~~~~~~~~~~~~~~~
697
Jakub Narebski4f73e242008-11-01 06:24:55 +0000698`merge`
699^^^^^^^
700
Alexei Sholikb547ce02011-03-18 15:14:27 +0200701The attribute `merge` affects how three versions of a file are
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700702merged when a file-level merge is necessary during `git merge`,
Ori Avtalion57f6ec02009-08-07 17:24:21 +0300703and other commands such as `git revert` and `git cherry-pick`.
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700704
705Set::
706
707 Built-in 3-way merge driver is used to merge the
Jonathan Nieder2fd02c92008-07-03 00:55:07 -0500708 contents in a way similar to 'merge' command of `RCS`
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700709 suite. This is suitable for ordinary text files.
710
711Unset::
712
713 Take the version from the current branch as the
714 tentative merge result, and declare that the merge has
Alexei Sholikb547ce02011-03-18 15:14:27 +0200715 conflicts. This is suitable for binary files that do
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700716 not have a well-defined merge semantics.
717
718Unspecified::
719
720 By default, this uses the same built-in 3-way merge
Alexei Sholikb547ce02011-03-18 15:14:27 +0200721 driver as is the case when the `merge` attribute is set.
722 However, the `merge.default` configuration variable can name
723 different merge driver to be used with paths for which the
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700724 `merge` attribute is unspecified.
725
Junio C Hamano2cc31672007-04-23 00:21:02 -0700726String::
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700727
728 3-way merge is performed using the specified custom
729 merge driver. The built-in 3-way merge driver can be
730 explicitly specified by asking for "text" driver; the
731 built-in "take the current branch" driver can be
Junio C Hamanob9d14ff2007-04-24 13:46:02 -0700732 requested with "binary".
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700733
734
Junio C Hamano0e545f72007-12-22 23:14:59 -0800735Built-in merge drivers
736^^^^^^^^^^^^^^^^^^^^^^
737
738There are a few built-in low-level merge drivers defined that
739can be asked for via the `merge` attribute.
740
741text::
742
743 Usual 3-way file level merge for text files. Conflicted
744 regions are marked with conflict markers `<<<<<<<`,
745 `=======` and `>>>>>>>`. The version from your branch
746 appears before the `=======` marker, and the version
747 from the merged branch appears after the `=======`
748 marker.
749
750binary::
751
752 Keep the version from your branch in the work tree, but
753 leave the path in the conflicted state for the user to
754 sort out.
755
756union::
757
758 Run 3-way file level merge for text files, but take
759 lines from both versions, instead of leaving conflict
760 markers. This tends to leave the added lines in the
761 resulting file in random order and the user should
762 verify the result. Do not use this if you do not
763 understand the implications.
764
765
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700766Defining a custom merge driver
767^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
768
Junio C Hamano0e545f72007-12-22 23:14:59 -0800769The definition of a merge driver is done in the `.git/config`
770file, not in the `gitattributes` file, so strictly speaking this
771manual page is a wrong place to talk about it. However...
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700772
773To define a custom merge driver `filfre`, add a section to your
774`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
775
776----------------------------------------------------------------
777[merge "filfre"]
778 name = feel-free merge driver
Junio C Hamanoef45bb12015-06-04 15:10:29 -0700779 driver = filfre %O %A %B %L %P
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700780 recursive = binary
781----------------------------------------------------------------
782
783The `merge.*.name` variable gives the driver a human-readable
784name.
785
786The `merge.*.driver` variable's value is used to construct a
787command to run to merge ancestor's version (`%O`), current
788version (`%A`) and the other branches' version (`%B`). These
789three tokens are replaced with the names of temporary files that
790hold the contents of these versions when the command line is
Bert Wesarg16758622010-02-23 21:11:12 +0100791built. Additionally, %L will be replaced with the conflict marker
792size (see below).
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700793
794The merge driver is expected to leave the result of the merge in
795the file named with `%A` by overwriting it, and exit with zero
796status if it managed to merge them cleanly, or non-zero if there
797were conflicts.
798
799The `merge.*.recursive` variable specifies what other merge
800driver to use when the merge driver is called for an internal
801merge between common ancestors, when there are more than one.
802When left unspecified, the driver itself is used for both
803internal merge and the final merge.
804
Junio C Hamanoef45bb12015-06-04 15:10:29 -0700805The merge driver can learn the pathname in which the merged result
806will be stored via placeholder `%P`.
807
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700808
Junio C Hamano4c734802010-01-20 23:49:27 -0800809`conflict-marker-size`
810^^^^^^^^^^^^^^^^^^^^^^
811
812This attribute controls the length of conflict markers left in
813the work tree file during a conflicted merge. Only setting to
814the value to a positive integer has any meaningful effect.
815
816For example, this line in `.gitattributes` can be used to tell the merge
817machinery to leave much longer (instead of the usual 7-character-long)
818conflict markers when merging the file `Documentation/git-merge.txt`
819results in a conflict.
820
821------------------------
822Documentation/git-merge.txt conflict-marker-size=32
823------------------------
824
825
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800826Checking whitespace errors
827~~~~~~~~~~~~~~~~~~~~~~~~~~
828
829`whitespace`
830^^^^^^^^^^^^
831
832The `core.whitespace` configuration variable allows you to define what
Jonathan Nieder2fd02c92008-07-03 00:55:07 -0500833'diff' and 'apply' should consider whitespace errors for all paths in
Dan McGee5162e692007-12-29 00:20:38 -0600834the project (See linkgit:git-config[1]). This attribute gives you finer
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800835control per path.
836
837Set::
838
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100839 Notice all types of potential whitespace errors known to Git.
Johannes Sixtf4b05a42010-11-30 09:29:11 +0100840 The tab width is taken from the value of the `core.whitespace`
841 configuration variable.
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800842
843Unset::
844
845 Do not notice anything as error.
846
847Unspecified::
848
Johannes Sixtf4b05a42010-11-30 09:29:11 +0100849 Use the value of the `core.whitespace` configuration variable to
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800850 decide what to notice as error.
851
852String::
853
854 Specify a comma separate list of common whitespace problems to
Johannes Sixtf4b05a42010-11-30 09:29:11 +0100855 notice in the same format as the `core.whitespace` configuration
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800856 variable.
857
858
Junio C Hamano8a33dd82008-07-05 18:14:27 -0700859Creating an archive
860~~~~~~~~~~~~~~~~~~~
861
Junio C Hamano08b51f52008-07-05 18:33:16 -0700862`export-ignore`
863^^^^^^^^^^^^^^^
864
865Files and directories with the attribute `export-ignore` won't be added to
866archive files.
867
Junio C Hamano8a33dd82008-07-05 18:14:27 -0700868`export-subst`
869^^^^^^^^^^^^^^
870
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100871If the attribute `export-subst` is set for a file then Git will expand
Junio C Hamano8a33dd82008-07-05 18:14:27 -0700872several placeholders when adding this file to an archive. The
Junio C Hamano08b51f52008-07-05 18:33:16 -0700873expansion depends on the availability of a commit ID, i.e., if
Junio C Hamano8a33dd82008-07-05 18:14:27 -0700874linkgit:git-archive[1] has been given a tree instead of a commit or a
875tag then no replacement will be done. The placeholders are the same
876as those for the option `--pretty=format:` of linkgit:git-log[1],
877except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
878in the file. E.g. the string `$Format:%H$` will be replaced by the
879commit hash.
880
881
Nasser Grainawi975457f2009-10-21 14:06:21 -0700882Packing objects
883~~~~~~~~~~~~~~~
884
885`delta`
886^^^^^^^
887
888Delta compression will not be attempted for blobs for paths with the
889attribute `delta` set to false.
890
891
Alexander Gavrilova2df1fb2008-11-13 20:28:49 +0300892Viewing files in GUI tools
893~~~~~~~~~~~~~~~~~~~~~~~~~~
894
895`encoding`
896^^^^^^^^^^
897
898The value of this attribute specifies the character encoding that should
899be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to
900display the contents of the relevant file. Note that due to performance
901considerations linkgit:gitk[1] does not use this attribute unless you
902manually enable per-file encodings in its options.
903
904If this attribute is not set or has an invalid value, the value of the
905`gui.encoding` configuration variable is used instead
906(See linkgit:git-config[1]).
907
908
Michael Haggerty09225702011-08-03 15:41:30 +0200909USING MACRO ATTRIBUTES
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700910----------------------
911
912You do not want any end-of-line conversions applied to, nor textual diffs
913produced for, any binary file you track. You would need to specify e.g.
914
915------------
Eyvind Bernhardsen5ec3e672010-05-19 22:43:11 +0200916*.jpg -text -diff
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700917------------
918
919but that may become cumbersome, when you have many attributes. Using
Michael Haggerty09225702011-08-03 15:41:30 +0200920macro attributes, you can define an attribute that, when set, also
Michael Haggerty98e84062011-08-03 15:41:29 +0200921sets or unsets a number of other attributes at the same time. The
Michael Haggerty09225702011-08-03 15:41:30 +0200922system knows a built-in macro attribute, `binary`:
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700923
924------------
925*.jpg binary
926------------
927
Michael Haggerty98e84062011-08-03 15:41:29 +0200928Setting the "binary" attribute also unsets the "text" and "diff"
Michael Haggerty09225702011-08-03 15:41:30 +0200929attributes as above. Note that macro attributes can only be "Set",
Michael Haggerty98e84062011-08-03 15:41:29 +0200930though setting one might have the effect of setting or unsetting other
931attributes or even returning other attributes to the "Unspecified"
932state.
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700933
934
Michael Haggerty09225702011-08-03 15:41:30 +0200935DEFINING MACRO ATTRIBUTES
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700936-------------------------
937
Michael Haggertye78e6962014-01-14 03:58:49 +0100938Custom macro attributes can be defined only in top-level gitattributes
939files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
940top level of the working tree, or the global or system-wide
941gitattributes files), not in `.gitattributes` files in working tree
942subdirectories. The built-in macro attribute "binary" is equivalent
943to:
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700944
945------------
Junio C Hamano155a4b72012-09-08 21:28:55 -0700946[attr]binary -diff -merge -text
Junio C Hamanobbb896d2008-08-30 14:35:15 -0700947------------
948
949
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700950EXAMPLE
951-------
952
953If you have these three `gitattributes` file:
954
955----------------------------------------------------------------
956(in $GIT_DIR/info/attributes)
957
958a* foo !bar -baz
959
960(in .gitattributes)
961abc foo bar baz
962
963(in t/.gitattributes)
964ab* merge=filfre
965abc -foo -bar
966*.c frotz
967----------------------------------------------------------------
968
969the attributes given to path `t/abc` are computed as follows:
970
9711. By examining `t/.gitattributes` (which is in the same
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100972 directory as the path in question), Git finds that the first
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700973 line matches. `merge` attribute is set. It also finds that
974 the second line matches, and attributes `foo` and `bar`
975 are unset.
976
9772. Then it examines `.gitattributes` (which is in the parent
978 directory), and finds that the first line matches, but
979 `t/.gitattributes` file already decided how `merge`, `foo`
980 and `bar` attributes should be given to this path, so it
981 leaves `foo` and `bar` unset. Attribute `baz` is set.
982
David Soria Parra5c759f92007-07-29 22:50:24 -03009833. Finally it examines `$GIT_DIR/info/attributes`. This file
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700984 is used to override the in-tree settings. The first line is
985 a match, and `foo` is set, `bar` is reverted to unspecified
986 state, and `baz` is unset.
987
Brian Hetro02783072007-08-23 20:44:13 -0400988As the result, the attributes assignment to `t/abc` becomes:
Junio C Hamano88e7fdf2007-04-19 20:48:03 -0700989
990----------------------------------------------------------------
991foo set to true
992bar unspecified
993baz set to false
994merge set to string value "filfre"
995frotz unspecified
996----------------------------------------------------------------
997
998
Michael Haggertycde15182011-08-04 06:36:11 +0200999SEE ALSO
1000--------
1001linkgit:git-check-attr[1].
René Scharfe8460b2f2007-09-03 20:07:01 +02001002
Junio C Hamano88e7fdf2007-04-19 20:48:03 -07001003GIT
1004---
Christian Couder9e1f0a82008-06-06 09:07:32 +02001005Part of the linkgit:git[1] suite