blob: 2d0a03715be65edfc4c8be6ca8f2a959ddde7540 [file] [log] [blame]
Junio C Hamanoe90436a2007-04-22 07:22:131gitattributes(5)
2================
3
4NAME
5----
Junio C Hamanoc9cb5172018-06-01 07:13:446gitattributes - Defining attributes per path
Junio C Hamanoe90436a2007-04-22 07:22:137
8SYNOPSIS
9--------
Junio C Hamano17bd2272008-09-01 06:11:1710$GIT_DIR/info/attributes, .gitattributes
Junio C Hamanoe90436a2007-04-22 07:22:1311
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
Junio C Hamano6b7d2152019-04-16 12:51:1521pattern attr1 attr2 ...
Junio C Hamanoe90436a2007-04-22 07:22:1322
Junio C Hamanod533bdb2009-02-25 09:56:5823That is, a pattern followed by an attributes list,
Junio C Hamanocbe0eb22017-02-27 23:37:4924separated 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.
Junio C Hamanoe90436a2007-04-22 07:22:1329
30Each attribute can be in one of these states for a given path:
31
32Set::
33
34The path has the attribute with special value "true";
35this is specified by listing only the name of the
36attribute in the attribute list.
37
38Unset::
39
40The path has the attribute with special value "false";
41this is specified by listing the name of the attribute
42prefixed with a dash `-` in the attribute list.
43
44Set to a value::
45
46The path has the attribute with specified string value;
47this is specified by listing the name of the attribute
48followed by an equal sign `=` and its value in the
49attribute list.
50
51Unspecified::
52
Junio C Hamanod533bdb2009-02-25 09:56:5853No pattern matches the path, and nothing says if
Junio C Hamano22572e72007-04-25 05:59:2554the path has or does not have the attribute, the
55attribute for the path is said to be Unspecified.
Junio C Hamanoe90436a2007-04-22 07:22:1356
Junio C Hamanod533bdb2009-02-25 09:56:5857When more than one pattern matches the path, a later line
Junio C Hamano22572e72007-04-25 05:59:2558overrides an earlier line. This overriding is done per
Junio C Hamano81000162018-03-21 19:54:5059attribute.
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)
Junio C Hamanoe90436a2007-04-22 07:22:1369
Junio C Hamano076ffcc2013-02-06 05:13:2170When deciding what attributes are assigned to a path, Git
Junio C Hamanoe90436a2007-04-22 07:22:1371consults `$GIT_DIR/info/attributes` file (which has the highest
72precedence), `.gitattributes` file in the same directory as the
Junio C Hamanob4a9ede2009-04-08 07:36:3273path in question, and its parent directories up to the toplevel of the
74work tree (the further the directory that contains `.gitattributes`
Junio C Hamano3b4609d2010-09-30 00:04:3475is from the path in question, the lower its precedence). Finally
76global and system-wide files are considered (they have the lowest
77precedence).
Junio C Hamanoe90436a2007-04-22 07:22:1378
Junio C Hamano6631a092012-10-10 22:50:5779When 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
Junio C Hamano99dc24a2008-03-27 23:49:5084If you wish to affect only a single repository (i.e., to assign
Junio C Hamano3b4609d2010-09-30 00:04:3485attributes to files that are particular to
86one user's workflow for that repository), then
Junio C Hamano99dc24a2008-03-27 23:49:5087attributes 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
Junio C Hamano3b4609d2010-09-30 00:04:3490`.gitattributes` files. Attributes that should affect all repositories
91for a single user should be placed in a file specified by the
Junio C Hamano322c6242015-03-23 21:32:4692`core.attributesFile` configuration option (see linkgit:git-config[1]).
Junio C Hamano8edb4c72012-07-09 20:33:5593Its 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.
Junio C Hamano3b4609d2010-09-30 00:04:3495Attributes for all users on a system should be placed in the
96`$(prefix)/etc/gitattributes` file.
Junio C Hamano99dc24a2008-03-27 23:49:5097
Junio C Hamanocbe0eb22017-02-27 23:37:4998Sometimes you would need to override a setting of an attribute
Junio C Hamano86d84362011-08-04 00:21:5199for a path to `Unspecified` state. This can be done by listing
Junio C Hamanoe90436a2007-04-22 07:22:13100the name of the attribute prefixed with an exclamation point `!`.
101
102
103EFFECTS
104-------
105
Junio C Hamano076ffcc2013-02-06 05:13:21106Certain operations by Git can be influenced by assigning
Junio C Hamano2a8f6dc2007-07-09 08:48:38107particular attributes to a path. Currently, the following
108operations are attributes-aware.
Junio C Hamanoe90436a2007-04-22 07:22:13109
110Checking-out and checking-in
111~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112
Junio C Hamano469d60e2007-04-29 18:30:34113These attributes affect how the contents stored in the
Junio C Hamanoe90436a2007-04-22 07:22:13114repository are copied to the working tree files when commands
Junio C Hamanoc9f11c22019-07-10 02:54:04115such as 'git switch', 'git checkout' and 'git merge' run.
116They also affect how
Junio C Hamano076ffcc2013-02-06 05:13:21117Git stores the contents you prepare in the working tree in the
Junio C Hamano1aa40d22010-01-21 17:46:43118repository upon 'git add' and 'git commit'.
Junio C Hamanoe90436a2007-04-22 07:22:13119
Junio C Hamanobb88cf42010-06-21 15:23:55120`text`
Junio C Hamano469d60e2007-04-29 18:30:34121^^^^^^
122
Junio C Hamanobb88cf42010-06-21 15:23:55123This attribute enables and controls end-of-line normalization. When a
124text file is normalized, its line endings are converted to LF in the
125repository. To control what line ending style is used in the working
126directory, use the `eol` attribute for a single file and the
127`core.eol` configuration variable for all text files.
Junio C Hamano23168ef2019-02-07 07:20:47128Note that setting `core.autocrlf` to `true` or `input` overrides
129`core.eol` (see the definitions of those options in
130linkgit:git-config[1]).
Junio C Hamano469d60e2007-04-29 18:30:34131
Junio C Hamanoe90436a2007-04-22 07:22:13132Set::
133
Junio C Hamanobb88cf42010-06-21 15:23:55134Setting the `text` attribute on a path enables end-of-line
135normalization and marks the path as a text file. End-of-line
136conversion takes place without guessing the content type.
Junio C Hamanoe90436a2007-04-22 07:22:13137
138Unset::
139
Junio C Hamano076ffcc2013-02-06 05:13:21140Unsetting the `text` attribute on a path tells Git not to
Junio C Hamanofcb740a2008-08-31 06:32:05141attempt any end-of-line conversion upon checkin or checkout.
Junio C Hamanoe90436a2007-04-22 07:22:13142
Junio C Hamanobb88cf42010-06-21 15:23:55143Set to string value "auto"::
144
145When `text` is set to "auto", the path is marked for automatic
Junio C Hamanoeed15af2016-07-25 22:49:42146end-of-line conversion. If Git decides that the content is
147text, its line endings are converted to LF on checkin.
Junio C Hamano0f1d17c2016-08-12 19:42:26148When the file has been committed with CRLF, no conversion is done.
Junio C Hamanobb88cf42010-06-21 15:23:55149
Junio C Hamanoe90436a2007-04-22 07:22:13150Unspecified::
151
Junio C Hamano076ffcc2013-02-06 05:13:21152If the `text` attribute is unspecified, Git uses the
Junio C Hamanobb88cf42010-06-21 15:23:55153`core.autocrlf` configuration variable to determine if the
154file should be converted.
Junio C Hamanoe90436a2007-04-22 07:22:13155
Junio C Hamano076ffcc2013-02-06 05:13:21156Any other value causes Git to act as if `text` has been left
Junio C Hamanobb88cf42010-06-21 15:23:55157unspecified.
Junio C Hamanoe90436a2007-04-22 07:22:13158
Junio C Hamanobb88cf42010-06-21 15:23:55159`eol`
160^^^^^
Junio C Hamanoe90436a2007-04-22 07:22:13161
Junio C Hamanobb88cf42010-06-21 15:23:55162This attribute sets a specific line-ending style to be used in the
Junio C Hamanoeed15af2016-07-25 22:49:42163working directory. It enables end-of-line conversion without any
Junio C Hamano8d57fa92017-09-19 05:01:08164content checks, effectively setting the `text` attribute. Note that
165setting this attribute on paths which are in the index with CRLF line
166endings may make the paths to be considered dirty. Adding the path to
167the index again will normalize the line endings in the index.
Junio C Hamanoe90436a2007-04-22 07:22:13168
Junio C Hamanobb88cf42010-06-21 15:23:55169Set to string value "crlf"::
Junio C Hamanoe90436a2007-04-22 07:22:13170
Junio C Hamano076ffcc2013-02-06 05:13:21171This setting forces Git to normalize line endings for this
Junio C Hamanobb88cf42010-06-21 15:23:55172file on checkin and convert them to CRLF when the file is
173checked out.
Junio C Hamanoe90436a2007-04-22 07:22:13174
Junio C Hamanobb88cf42010-06-21 15:23:55175Set to string value "lf"::
Junio C Hamanoe90436a2007-04-22 07:22:13176
Junio C Hamano076ffcc2013-02-06 05:13:21177This setting forces Git to normalize line endings to LF on
Junio C Hamanobb88cf42010-06-21 15:23:55178checkin and prevents conversion to CRLF when the file is
179checked out.
Junio C Hamanoe90436a2007-04-22 07:22:13180
Junio C Hamanobb88cf42010-06-21 15:23:55181Backwards compatibility with `crlf` attribute
182^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
183
184For backwards compatibility, the `crlf` attribute is interpreted as
185follows:
186
187------------------------
188crlf text
189-crlf -text
190crlf=input eol=lf
191------------------------
192
193End-of-line conversion
194^^^^^^^^^^^^^^^^^^^^^^
195
Junio C Hamano076ffcc2013-02-06 05:13:21196While Git normally leaves file contents alone, it can be configured to
Junio C Hamanobb88cf42010-06-21 15:23:55197normalize line endings to LF in the repository and, optionally, to
198convert them to CRLF when files are checked out.
199
Junio C Hamanoe7808d72016-08-26 21:48:01200If you simply want to have CRLF line endings in your working directory
201regardless of the repository you are working with, you can set the
202config variable "core.autocrlf" without using any attributes.
203
204------------------------
205[core]
206autocrlf = true
207------------------------
208
209This does not force normalization of text files, but does ensure
210that text files that you introduce to the repository have their line
211endings normalized to LF when they are added, and that files that are
212already normalized in the repository stay normalized.
213
214If you want to ensure that text files that any contributor introduces to
215the repository have their line endings normalized, you can set the
216`text` attribute to "auto" for _all_ files.
217
218------------------------
219* text=auto
220------------------------
221
222The attributes allow a fine-grained control, how the line endings
223are converted.
Junio C Hamano076ffcc2013-02-06 05:13:21224Here is an example that will make Git normalize .txt, .vcproj and .sh
Junio C Hamanobb88cf42010-06-21 15:23:55225files, ensure that .vcproj files have CRLF and .sh files have LF in
226the working directory, and prevent .jpg files from being normalized
227regardless of their content.
228
229------------------------
Junio C Hamanoeed15af2016-07-25 22:49:42230* text=auto
Junio C Hamanobb88cf42010-06-21 15:23:55231*.txt text
Junio C Hamanoeed15af2016-07-25 22:49:42232*.vcproj text eol=crlf
233*.sh text eol=lf
Junio C Hamanobb88cf42010-06-21 15:23:55234*.jpg -text
235------------------------
236
Junio C Hamanoe7808d72016-08-26 21:48:01237NOTE: When `text=auto` conversion is enabled in a cross-platform
238project using push and pull to a central repository the text files
239containing CRLFs should be normalized.
Junio C Hamanobb88cf42010-06-21 15:23:55240
Junio C Hamanoe7808d72016-08-26 21:48:01241From a clean working directory:
Junio C Hamanobb88cf42010-06-21 15:23:55242
243-------------------------------------------------
Junio C Hamanoe7808d72016-08-26 21:48:01244$ echo "* text=auto" >.gitattributes
Junio C Hamano4886c772017-11-27 03:33:28245$ git add --renormalize .
Junio C Hamanobb88cf42010-06-21 15:23:55246$ git status # Show files that will be normalized
Junio C Hamanobb88cf42010-06-21 15:23:55247$ git commit -m "Introduce end-of-line normalization"
248-------------------------------------------------
249
250If any files that should not be normalized show up in 'git status',
251unset their `text` attribute before running 'git add -u'.
252
253------------------------
254manual.pdf -text
255------------------------
256
Junio C Hamano076ffcc2013-02-06 05:13:21257Conversely, text files that Git does not detect can have normalization
Junio C Hamanobb88cf42010-06-21 15:23:55258enabled manually.
259
260------------------------
261weirdchars.txt text
262------------------------
Junio C Hamanoe90436a2007-04-22 07:22:13263
Junio C Hamano076ffcc2013-02-06 05:13:21264If `core.safecrlf` is set to "true" or "warn", Git verifies if
Junio C Hamano26e590a2008-02-17 03:53:51265the conversion is reversible for the current setting of
Junio C Hamano076ffcc2013-02-06 05:13:21266`core.autocrlf`. For "true", Git rejects irreversible
267conversions; for "warn", Git only prints a warning but accepts
Junio C Hamano26e590a2008-02-17 03:53:51268an irreversible conversion. The safety triggers to prevent such
269a conversion done to the files in the work tree, but there are a
270few exceptions. Even though...
271
Junio C Hamano1aa40d22010-01-21 17:46:43272- 'git add' itself does not touch the files in the work tree, the
Junio C Hamano26e590a2008-02-17 03:53:51273 next checkout would, so the safety triggers;
274
Junio C Hamano1aa40d22010-01-21 17:46:43275- 'git apply' to update a text file with a patch does touch the files
Junio C Hamano26e590a2008-02-17 03:53:51276 in the work tree, but the operation is about text files and CRLF
277 conversion is about fixing the line ending inconsistencies, so the
278 safety does not trigger;
279
Junio C Hamano1aa40d22010-01-21 17:46:43280- 'git diff' itself does not touch the files in the work tree, it is
281 often run to inspect the changes you intend to next 'git add'. To
Junio C Hamano26e590a2008-02-17 03:53:51282 catch potential problems early, safety triggers.
283
Junio C Hamanoe90436a2007-04-22 07:22:13284
Junio C Hamanoccb82522018-05-08 07:52:09285`working-tree-encoding`
286^^^^^^^^^^^^^^^^^^^^^^^
287
288Git recognizes files encoded in ASCII or one of its supersets (e.g.
289UTF-8, ISO-8859-1, ...) as text files. Files encoded in certain other
290encodings (e.g. UTF-16) are interpreted as binary and consequently
291built-in Git text processing tools (e.g. 'git diff') as well as most Git
292web front ends do not visualize the contents of these files by default.
293
294In these cases you can tell Git the encoding of a file in the working
295directory with the `working-tree-encoding` attribute. If a file with this
Junio C Hamano8ef91f32019-12-01 22:58:27296attribute is added to Git, then Git re-encodes the content from the
Junio C Hamanoccb82522018-05-08 07:52:09297specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
298content in its internal data structure (called "the index"). On checkout
Junio C Hamano8ef91f32019-12-01 22:58:27299the content is re-encoded back to the specified encoding.
Junio C Hamanoccb82522018-05-08 07:52:09300
301Please note that using the `working-tree-encoding` attribute may have a
302number of pitfalls:
303
304- Alternative Git implementations (e.g. JGit or libgit2) and older Git
305 versions (as of March 2018) do not support the `working-tree-encoding`
306 attribute. If you decide to use the `working-tree-encoding` attribute
307 in your repository, then it is strongly recommended to ensure that all
308 clients working with the repository support it.
Junio C Hamano94d00a52018-10-30 07:34:40309+
310For example, Microsoft Visual Studio resources files (`*.rc`) or
311PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
312If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
313a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
314stored as UTF-8 internally. A client without `working-tree-encoding`
315support will checkout `foo.ps1` as UTF-8 encoded file. This will
316typically cause trouble for the users of this file.
317+
Junio C Hamano6b7d2152019-04-16 12:51:15318If a Git client that does not support the `working-tree-encoding`
319attribute adds a new file `bar.ps1`, then `bar.ps1` will be
Junio C Hamano94d00a52018-10-30 07:34:40320stored "as-is" internally (in this example probably as UTF-16).
321A client with `working-tree-encoding` support will interpret the
322internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
323That operation will fail and cause an error.
Junio C Hamanoccb82522018-05-08 07:52:09324
325- Reencoding content to non-UTF encodings can cause errors as the
326 conversion might not be UTF-8 round trip safe. If you suspect your
327 encoding to not be round trip safe, then add it to
328 `core.checkRoundtripEncoding` to make Git check the round trip
329 encoding (see linkgit:git-config[1]). SHIFT-JIS (Japanese character
330 set) is known to have round trip issues with UTF-8 and is checked by
331 default.
332
333- Reencoding content requires resources that might slow down certain
334 Git operations (e.g 'git checkout' or 'git add').
335
336Use the `working-tree-encoding` attribute only if you cannot store a file
337in UTF-8 encoding and if you want Git to be able to process the content
338as text.
339
340As an example, use the following attributes if your '*.ps1' files are
341UTF-16 encoded with byte order mark (BOM) and you want Git to perform
342automatic line ending conversion based on your platform.
343
344------------------------
345*.ps1 text working-tree-encoding=UTF-16
346------------------------
347
348Use the following attributes if your '*.ps1' files are UTF-16 little
349endian encoded without BOM and you want Git to use Windows line endings
Junio C Hamanodecc7312019-03-11 09:02:54350in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
Junio C Hamano23168ef2019-02-07 07:20:47351you want UTF-16 little endian with BOM).
352Please note, it is highly recommended to
Junio C Hamanoccb82522018-05-08 07:52:09353explicitly define the line endings with `eol` if the `working-tree-encoding`
354attribute is used to avoid ambiguity.
355
356------------------------
357*.ps1 text working-tree-encoding=UTF-16LE eol=CRLF
358------------------------
359
360You can get a list of all available encodings on your platform with the
361following command:
362
363------------------------
364iconv --list
365------------------------
366
367If you do not know the encoding of a file, then you can use the `file`
368command to guess the encoding:
369
370------------------------
371file foo.ps1
372------------------------
373
374
Junio C Hamano469d60e2007-04-29 18:30:34375`ident`
376^^^^^^^
377
Junio C Hamano076ffcc2013-02-06 05:13:21378When the attribute `ident` is set for a path, Git replaces
Junio C Hamano6f1bbb72008-10-31 11:32:55379`$Id$` in the blob object with `$Id:`, followed by the
Junio C Hamano469d60e2007-04-29 18:30:3438040-character hexadecimal blob object name, followed by a dollar
381sign `$` upon checkout. Any byte sequence that begins with
Junio C Hamano0430e3a2007-05-15 03:13:17382`$Id:` and ends with `$` in the worktree file is replaced
383with `$Id$` upon check-in.
Junio C Hamano469d60e2007-04-29 18:30:34384
385
Junio C Hamano469d60e2007-04-29 18:30:34386`filter`
387^^^^^^^^
388
Junio C Hamano361c1332007-11-14 12:17:22389A `filter` attribute can be set to a string value that names a
Junio C Hamano469d60e2007-04-29 18:30:34390filter driver specified in the configuration.
391
Junio C Hamano361c1332007-11-14 12:17:22392A filter driver consists of a `clean` command and a `smudge`
Junio C Hamano469d60e2007-04-29 18:30:34393command, either of which can be left unspecified. Upon
Junio C Hamano361c1332007-11-14 12:17:22394checkout, when the `smudge` command is specified, the command is
395fed the blob object from its standard input, and its standard
396output is used to update the worktree file. Similarly, the
397`clean` command is used to convert the contents of worktree file
Junio C Hamanof2f28b12016-10-31 21:41:58398upon checkin. By default these commands process only a single
399blob and terminate. If a long running `process` filter is used
400in place of `clean` and/or `smudge` filters, then Git can process
401all blobs with a single filter command invocation for the entire
402life of a single Git command, for example `git add --all`. If a
403long running `process` filter is configured then it always takes
404precedence over a configured single blob filter. See section
405below for the description of the protocol used to communicate with
406a `process` filter.
Junio C Hamano469d60e2007-04-29 18:30:34407
Junio C Hamano90a5b7b2012-02-28 23:40:31408One use of the content filtering is to massage the content into a shape
409that is more convenient for the platform, filesystem, and the user to use.
410For this mode of operation, the key phrase here is "more convenient" and
411not "turning something unusable into usable". In other words, the intent
412is that if someone unsets the filter driver definition, or does not have
413the appropriate filter program, the project should still be usable.
Junio C Hamano469d60e2007-04-29 18:30:34414
Junio C Hamano90a5b7b2012-02-28 23:40:31415Another use of the content filtering is to store the content that cannot
416be directly used in the repository (e.g. a UUID that refers to the true
Junio C Hamano076ffcc2013-02-06 05:13:21417content stored outside Git, or an encrypted content) and turn it into a
Junio C Hamano90a5b7b2012-02-28 23:40:31418usable form upon checkout (e.g. download the external content, or decrypt
419the encrypted content).
420
421These two filters behave differently, and by default, a filter is taken as
422the former, massaging the contents into more convenient shape. A missing
423filter driver definition in the config, or a filter driver that exits with
424a non-zero status, is not an error but makes the filter a no-op passthru.
425
426You can declare that a filter turns a content that by itself is unusable
427into a usable content by setting the filter.<driver>.required configuration
428variable to `true`.
Junio C Hamano469d60e2007-04-29 18:30:34429
Junio C Hamano4886c772017-11-27 03:33:28430Note: Whenever the clean filter is changed, the repo should be renormalized:
431$ git add --renormalize .
432
Junio C Hamano6a548ef2009-12-17 00:16:20433For example, in .gitattributes, you would assign the `filter`
434attribute for paths.
435
436------------------------
437*.c filter=indent
438------------------------
439
440Then you would define a "filter.indent.clean" and "filter.indent.smudge"
441configuration in your .git/config to specify a pair of commands to
442modify the contents of C programs when the source files are checked
443in ("clean" is run) and checked out (no change is made because the
444command is "cat").
445
446------------------------
447[filter "indent"]
448clean = indent
449smudge = cat
450------------------------
451
Junio C Hamano2db3e752010-09-03 21:33:06452For best results, `clean` should not alter its output further if it is
453run twice ("clean->clean" should be equivalent to "clean"), and
454multiple `smudge` commands should not alter `clean`'s output
455("smudge->smudge->clean" should be equivalent to "clean"). See the
456section on merging below.
457
458The "indent" filter is well-behaved in this regard: it will not modify
459input that is already correctly indented. In this case, the lack of a
460smudge filter means that the clean filter _must_ accept its own output
461without modifying it.
462
Junio C Hamano90a5b7b2012-02-28 23:40:31463If a filter _must_ succeed in order to make the stored contents usable,
464you can declare that the filter is `required`, in the configuration:
465
466------------------------
467[filter "crypt"]
468clean = openssl enc ...
469smudge = openssl enc -d ...
470required
471------------------------
472
Junio C Hamanoe0552e42011-01-06 00:34:47473Sequence "%f" on the filter command line is replaced with the name of
474the file the filter is working on. A filter might use this in keyword
475substitution. For example:
476
477------------------------
478[filter "p4"]
479clean = git-p4-filter --clean %f
480smudge = git-p4-filter --smudge %f
481------------------------
482
Junio C Hamanoe548d1b2016-08-08 22:26:49483Note that "%f" is the name of the path that is being worked on. Depending
484on the version that is being filtered, the corresponding file on disk may
485not exist, or may have different contents. So, smudge and clean commands
486should not try to access the file on disk, but only act as filters on the
487content provided to them on standard input.
Junio C Hamano469d60e2007-04-29 18:30:34488
Junio C Hamanof2f28b12016-10-31 21:41:58489Long Running Filter Process
490^^^^^^^^^^^^^^^^^^^^^^^^^^^
491
492If the filter command (a string value) is defined via
493`filter.<driver>.process` then Git can process all blobs with a
494single filter invocation for the entire life of a single Git
Junio C Hamano640779d2018-02-14 01:29:14495command. This is achieved by using the long-running process protocol
496(described in technical/long-running-process-protocol.txt).
Junio C Hamanof2f28b12016-10-31 21:41:58497
Junio C Hamano640779d2018-02-14 01:29:14498When Git encounters the first file that needs to be cleaned or smudged,
499it starts the filter and performs the handshake. In the handshake, the
500welcome message sent by Git is "git-filter-client", only version 2 is
Junio C Hamano8ef91f32019-12-01 22:58:27501supported, and the supported capabilities are "clean", "smudge", and
Junio C Hamano640779d2018-02-14 01:29:14502"delay".
Junio C Hamanof2f28b12016-10-31 21:41:58503
504Afterwards Git sends a list of "key=value" pairs terminated with
505a flush packet. The list will contain at least the filter command
506(based on the supported capabilities) and the pathname of the file
507to filter relative to the repository root. Right after the flush packet
508Git sends the content split in zero or more pkt-line packets and a
509flush packet to terminate content. Please note, that the filter
510must not send any response before it received the content and the
Junio C Hamano9e35abf2016-12-27 22:37:27511final flush packet. Also note that the "value" of a "key=value" pair
512can contain the "=" character whereas the key would never contain
513that character.
Junio C Hamanof2f28b12016-10-31 21:41:58514------------------------
515packet: git> command=smudge
516packet: git> pathname=path/testfile.dat
517packet: git> 0000
518packet: git> CONTENT
519packet: git> 0000
520------------------------
521
522The filter is expected to respond with a list of "key=value" pairs
523terminated with a flush packet. If the filter does not experience
524problems then the list must contain a "success" status. Right after
525these packets the filter is expected to send the content in zero
526or more pkt-line packets and a flush packet at the end. Finally, a
527second list of "key=value" pairs terminated with a flush packet
528is expected. The filter can change the status in the second list
529or keep the status as is with an empty list. Please note that the
530empty list must be terminated with a flush packet regardless.
531
532------------------------
533packet: git< status=success
534packet: git< 0000
535packet: git< SMUDGED_CONTENT
536packet: git< 0000
537packet: git< 0000 # empty list, keep "status=success" unchanged!
538------------------------
539
540If the result content is empty then the filter is expected to respond
541with a "success" status and a flush packet to signal the empty content.
542------------------------
543packet: git< status=success
544packet: git< 0000
545packet: git< 0000 # empty content!
546packet: git< 0000 # empty list, keep "status=success" unchanged!
547------------------------
548
549In case the filter cannot or does not want to process the content,
550it is expected to respond with an "error" status.
551------------------------
552packet: git< status=error
553packet: git< 0000
554------------------------
555
556If the filter experiences an error during processing, then it can
557send the status "error" after the content was (partially or
558completely) sent.
559------------------------
560packet: git< status=success
561packet: git< 0000
562packet: git< HALF_WRITTEN_ERRONEOUS_CONTENT
563packet: git< 0000
564packet: git< status=error
565packet: git< 0000
566------------------------
567
568In case the filter cannot or does not want to process the content
569as well as any future content for the lifetime of the Git process,
570then it is expected to respond with an "abort" status at any point
571in the protocol.
572------------------------
573packet: git< status=abort
574packet: git< 0000
575------------------------
576
577Git neither stops nor restarts the filter process in case the
578"error"/"abort" status is set. However, Git sets its exit code
579according to the `filter.<driver>.required` flag, mimicking the
580behavior of the `filter.<driver>.clean` / `filter.<driver>.smudge`
581mechanism.
582
583If the filter dies during the communication or does not adhere to
584the protocol then Git will stop the filter process and restart it
585with the next file that needs to be processed. Depending on the
586`filter.<driver>.required` flag Git will interpret that as error.
587
Junio C Hamano4b2a6c12017-08-22 18:32:37588Delay
589^^^^^
590
591If the filter supports the "delay" capability, then Git can send the
592flag "can-delay" after the filter command and pathname. This flag
593denotes that the filter can delay filtering the current blob (e.g. to
594compensate network latencies) by responding with no content but with
595the status "delayed" and a flush packet.
596------------------------
597packet: git> command=smudge
598packet: git> pathname=path/testfile.dat
599packet: git> can-delay=1
600packet: git> 0000
601packet: git> CONTENT
602packet: git> 0000
603packet: git< status=delayed
604packet: git< 0000
605------------------------
606
607If the filter supports the "delay" capability then it must support the
608"list_available_blobs" command. If Git sends this command, then the
609filter is expected to return a list of pathnames representing blobs
610that have been delayed earlier and are now available.
611The list must be terminated with a flush packet followed
612by a "success" status that is also terminated with a flush packet. If
613no blobs for the delayed paths are available, yet, then the filter is
614expected to block the response until at least one blob becomes
615available. The filter can tell Git that it has no more delayed blobs
616by sending an empty list. As soon as the filter responds with an empty
617list, Git stops asking. All blobs that Git has not received at this
618point are considered missing and will result in an error.
619
620------------------------
621packet: git> command=list_available_blobs
622packet: git> 0000
623packet: git< pathname=path/testfile.dat
624packet: git< pathname=path/otherfile.dat
625packet: git< 0000
626packet: git< status=success
627packet: git< 0000
628------------------------
629
630After Git received the pathnames, it will request the corresponding
631blobs again. These requests contain a pathname and an empty content
632section. The filter is expected to respond with the smudged content
633in the usual way as explained above.
634------------------------
635packet: git> command=smudge
636packet: git> pathname=path/testfile.dat
637packet: git> 0000
638packet: git> 0000 # empty content!
639packet: git< status=success
640packet: git< 0000
641packet: git< SMUDGED_CONTENT
642packet: git< 0000
643packet: git< 0000 # empty list, keep "status=success" unchanged!
644------------------------
645
646Example
647^^^^^^^
648
Junio C Hamanof2f28b12016-10-31 21:41:58649A long running filter demo implementation can be found in
650`contrib/long-running-filter/example.pl` located in the Git
651core repository. If you develop your own long running filter
652process then the `GIT_TRACE_PACKET` environment variables can be
653very helpful for debugging (see linkgit:git[1]).
654
655Please note that you cannot use an existing `filter.<driver>.clean`
656or `filter.<driver>.smudge` command with `filter.<driver>.process`
657because the former two use a different inter process communication
658protocol than the latter one.
659
660
Junio C Hamano469d60e2007-04-29 18:30:34661Interaction between checkin/checkout attributes
662^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
663
664In the check-in codepath, the worktree file is first converted
665with `filter` driver (if specified and corresponding driver
666defined), then the result is processed with `ident` (if
Junio C Hamanobb88cf42010-06-21 15:23:55667specified), and then finally with `text` (again, if specified
Junio C Hamano469d60e2007-04-29 18:30:34668and applicable).
669
670In the check-out codepath, the blob content is first converted
Junio C Hamanobb88cf42010-06-21 15:23:55671with `text`, and then `ident` and fed to `filter`.
Junio C Hamano469d60e2007-04-29 18:30:34672
673
Junio C Hamano2db3e752010-09-03 21:33:06674Merging branches with differing checkin/checkout attributes
675^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
676
677If you have added attributes to a file that cause the canonical
678repository format for that file to change, such as adding a
679clean/smudge filter or text/eol/ident attributes, merging anything
680where the attribute is not in place would normally cause merge
681conflicts.
682
Junio C Hamano076ffcc2013-02-06 05:13:21683To prevent these unnecessary merge conflicts, Git can be told to run a
Junio C Hamano2db3e752010-09-03 21:33:06684virtual check-out and check-in of all three stages of a file when
685resolving a three-way merge by setting the `merge.renormalize`
686configuration variable. This prevents changes caused by check-in
687conversion from causing spurious merge conflicts when a converted file
688is merged with an unconverted file.
689
690As long as a "smudge->clean" results in the same output as a "clean"
691even on files that are already smudged, this strategy will
692automatically resolve all filter-related conflicts. Filters that do
693not act in this way may cause additional merge conflicts that must be
694resolved manually.
695
696
Junio C Hamanoe90436a2007-04-22 07:22:13697Generating diff text
698~~~~~~~~~~~~~~~~~~~~
699
Junio C Hamanof7e47ee2008-11-02 18:16:45700`diff`
701^^^^^^
702
Junio C Hamano076ffcc2013-02-06 05:13:21703The attribute `diff` affects how Git generates diffs for particular
704files. It can tell Git whether to generate a textual patch for the path
Junio C Hamano28363492008-11-14 08:26:31705or to treat the path as a binary file. It can also affect what line is
Junio C Hamano076ffcc2013-02-06 05:13:21706shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an
707external command to generate the diff, or ask Git to convert binary
Junio C Hamano28363492008-11-14 08:26:31708files to a text format before generating the diff.
Junio C Hamanoe90436a2007-04-22 07:22:13709
710Set::
711
712A path to which the `diff` attribute is set is treated
713as text, even when they contain byte values that
714normally never appear in text files, such as NUL.
715
716Unset::
717
718A path to which the `diff` attribute is unset will
Junio C Hamano28363492008-11-14 08:26:31719generate `Binary files differ` (or a binary patch, if
720binary patches are enabled).
Junio C Hamanoe90436a2007-04-22 07:22:13721
722Unspecified::
723
724A path to which the `diff` attribute is unspecified
725first gets its contents inspected, and if it looks like
Junio C Hamano8e61f1f2014-09-11 21:53:45726text and is smaller than core.bigFileThreshold, it is treated
727as text. Otherwise it would generate `Binary files differ`.
Junio C Hamanoe90436a2007-04-22 07:22:13728
Junio C Hamano9db95ca2007-04-23 07:27:05729String::
730
Junio C Hamano28363492008-11-14 08:26:31731Diff is shown using the specified diff driver. Each driver may
732specify one or more options, as described in the following
733section. The options for the diff driver "foo" are defined
734by the configuration variables in the "diff.foo" section of the
Junio C Hamano076ffcc2013-02-06 05:13:21735Git config file.
Junio C Hamano9db95ca2007-04-23 07:27:05736
737
Junio C Hamano28363492008-11-14 08:26:31738Defining an external diff driver
739^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Junio C Hamano9db95ca2007-04-23 07:27:05740
741The definition of a diff driver is done in `gitconfig`, not
742`gitattributes` file, so strictly speaking this manual page is a
743wrong place to talk about it. However...
744
Junio C Hamano28363492008-11-14 08:26:31745To define an external diff driver `jcdiff`, add a section to your
Junio C Hamano9db95ca2007-04-23 07:27:05746`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
747
748----------------------------------------------------------------
749[diff "jcdiff"]
750command = j-c-diff
751----------------------------------------------------------------
752
Junio C Hamano076ffcc2013-02-06 05:13:21753When Git needs to show you a diff for the path with `diff`
Junio C Hamano9db95ca2007-04-23 07:27:05754attribute set to `jcdiff`, it calls the command you specified
755with the above configuration, i.e. `j-c-diff`, with 7
756parameters, just like `GIT_EXTERNAL_DIFF` program is called.
Junio C Hamanof7c042d2008-06-06 22:50:53757See linkgit:git[1] for details.
Junio C Hamanoe90436a2007-04-22 07:22:13758
759
Junio C Hamano2a8f6dc2007-07-09 08:48:38760Defining a custom hunk-header
761^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
762
Junio C Hamano5e4d8de2008-09-19 06:27:02763Each group of changes (called a "hunk") in the textual diff output
Junio C Hamano2a8f6dc2007-07-09 08:48:38764is prefixed with a line of the form:
765
766@@ -k,l +n,m @@ TEXT
767
Junio C Hamano5e4d8de2008-09-19 06:27:02768This is called a 'hunk header'. The "TEXT" portion is by default a line
769that begins with an alphabet, an underscore or a dollar sign; this
770matches what GNU 'diff -p' output uses. This default selection however
771is not suited for some contents, and you can use a customized pattern
772to make a selection.
Junio C Hamano2a8f6dc2007-07-09 08:48:38773
Junio C Hamano5e4d8de2008-09-19 06:27:02774First, in .gitattributes, you would assign the `diff` attribute
Junio C Hamano2a8f6dc2007-07-09 08:48:38775for paths.
776
777------------------------
778*.tex diff=tex
779------------------------
780
Junio C Hamanoa476efa2008-10-10 15:31:42781Then, you would define a "diff.tex.xfuncname" configuration to
Junio C Hamano2a8f6dc2007-07-09 08:48:38782specify a regular expression that matches a line that you would
Junio C Hamano3bd66e92009-04-18 06:17:56783want to appear as the hunk header "TEXT". Add a section to your
784`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
Junio C Hamano2a8f6dc2007-07-09 08:48:38785
786------------------------
787[diff "tex"]
Junio C Hamanoa476efa2008-10-10 15:31:42788xfuncname = "^(\\\\(sub)*section\\{.*)$"
Junio C Hamano2a8f6dc2007-07-09 08:48:38789------------------------
790
791Note. A single level of backslashes are eaten by the
792configuration file parser, so you would need to double the
793backslashes; the pattern above picks a line that begins with a
Junio C Hamanoa6387422007-08-25 03:54:27794backslash, and zero or more occurrences of `sub` followed by
Junio C Hamano2a8f6dc2007-07-09 08:48:38795`section` followed by open brace, to the end of line.
796
797There are a few built-in patterns to make this easier, and `tex`
798is one of them, so you do not have to write the above in your
799configuration file (you still need to enable this with the
Junio C Hamanoa76cb0d2008-08-13 20:04:10800attribute mechanism, via `.gitattributes`). The following built in
801patterns are available:
802
Junio C Hamano4f07aec2012-09-25 19:08:44803- `ada` suitable for source code in the Ada language.
804
Junio C Hamanoa76cb0d2008-08-13 20:04:10805- `bibtex` suitable for files with BibTeX coded references.
806
Junio C Hamano20d47e32009-01-26 06:36:02807- `cpp` suitable for source code in the C and C++ languages.
808
Junio C Hamano53ba6d02010-08-22 07:25:12809- `csharp` suitable for source code in the C# language.
810
Junio C Hamanofedb1b42016-06-20 21:23:40811- `css` suitable for cascading style sheets.
812
Junio C Hamanocb705392019-09-18 19:30:01813- `dts` suitable for devicetree (DTS) files.
814
Junio C Hamano8ef91f32019-12-01 22:58:27815- `elixir` suitable for source code in the Elixir language.
816
Junio C Hamano3b4609d2010-09-30 00:04:34817- `fortran` suitable for source code in the Fortran language.
818
Junio C Hamanod7ed4042015-08-03 19:43:00819- `fountain` suitable for Fountain documents.
820
Junio C Hamanoa25ccc42018-03-08 21:36:14821- `golang` suitable for source code in the Go language.
822
Junio C Hamanof24b8062008-09-09 01:34:39823- `html` suitable for HTML/XHTML documents.
824
Junio C Hamano675570c2008-09-13 06:07:28825- `java` suitable for source code in the Java language.
Junio C Hamanoa76cb0d2008-08-13 20:04:10826
Junio C Hamano2b43cff2020-05-08 22:27:04827- `markdown` suitable for Markdown documents.
828
Junio C Hamano73c64862019-06-18 03:24:20829- `matlab` suitable for source code in the MATLAB and Octave languages.
Junio C Hamano92887a32011-12-07 00:26:29830
Junio C Hamanoa476efa2008-10-10 15:31:42831- `objc` suitable for source code in the Objective-C language.
832
Junio C Hamanoa76cb0d2008-08-13 20:04:10833- `pascal` suitable for source code in the Pascal/Delphi language.
834
Junio C Hamano9b6fafe2011-01-14 00:43:22835- `perl` suitable for source code in the Perl language.
836
Junio C Hamanof24b8062008-09-09 01:34:39837- `php` suitable for source code in the PHP language.
838
Junio C Hamano3f2f6e52008-08-21 10:34:22839- `python` suitable for source code in the Python language.
840
Junio C Hamanoa76cb0d2008-08-13 20:04:10841- `ruby` suitable for source code in the Ruby language.
842
Junio C Hamanod0a99402019-06-21 18:58:41843- `rust` suitable for source code in the Rust language.
844
Junio C Hamanoa76cb0d2008-08-13 20:04:10845- `tex` suitable for source code for LaTeX documents.
Junio C Hamano2a8f6dc2007-07-09 08:48:38846
847
Junio C Hamano20d47e32009-01-26 06:36:02848Customizing word diff
849^^^^^^^^^^^^^^^^^^^^^
850
Junio C Hamanocc7636a2010-05-21 14:57:53851You can customize the rules that `git diff --word-diff` uses to
Junio C Hamano20d47e32009-01-26 06:36:02852split words in a line, by specifying an appropriate regular expression
853in the "diff.*.wordRegex" configuration variable. For example, in TeX
854a backslash followed by a sequence of letters forms a command, but
855several such commands can be run together without intervening
Junio C Hamano3bd66e92009-04-18 06:17:56856whitespace. To separate them, use a regular expression in your
857`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
Junio C Hamano20d47e32009-01-26 06:36:02858
859------------------------
860[diff "tex"]
861wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
862------------------------
863
864A built-in pattern is provided for all languages listed in the
865previous section.
866
867
Junio C Hamano28363492008-11-14 08:26:31868Performing text diffs of binary files
869^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
870
871Sometimes it is desirable to see the diff of a text-converted
872version of some binary files. For example, a word processor
873document can be converted to an ASCII text representation, and
874the diff of the text shown. Even though this conversion loses
875some information, the resulting diff is useful for human
876viewing (but cannot be applied directly).
877
878The `textconv` config option is used to define a program for
879performing such a conversion. The program should take a single
880argument, the name of a file to convert, and produce the
881resulting text on stdout.
882
883For example, to show the diff of the exif information of a
884file instead of the binary information (assuming you have the
Junio C Hamano3bd66e92009-04-18 06:17:56885exif tool installed), add the following section to your
886`$GIT_DIR/config` file (or `$HOME/.gitconfig` file):
Junio C Hamano28363492008-11-14 08:26:31887
888------------------------
889[diff "jpg"]
890textconv = exif
891------------------------
892
893NOTE: The text conversion is generally a one-way conversion;
894in this example, we lose the actual image contents and focus
895just on the text data. This means that diffs generated by
896textconv are _not_ suitable for applying. For this reason,
897only `git diff` and the `git log` family of commands (i.e.,
898log, whatchanged, show) will perform text conversion. `git
899format-patch` will never generate this output. If you want to
900send somebody a text-converted diff of a binary file (e.g.,
901because it quickly conveys the changes you have made), you
902should generate it separately and send it as a comment _in
903addition to_ the usual binary diff that you might send.
904
Junio C Hamanocb39aea2010-05-09 07:24:48905Because text conversion can be slow, especially when doing a
Junio C Hamano076ffcc2013-02-06 05:13:21906large number of them with `git log -p`, Git provides a mechanism
Junio C Hamanocb39aea2010-05-09 07:24:48907to cache the output and use it in future diffs. To enable
908caching, set the "cachetextconv" variable in your diff driver's
909config. For example:
910
911------------------------
912[diff "jpg"]
913textconv = exif
914cachetextconv = true
915------------------------
916
917This will cache the result of running "exif" on each blob
918indefinitely. If you change the textconv config variable for a
Junio C Hamano076ffcc2013-02-06 05:13:21919diff driver, Git will automatically invalidate the cache entries
Junio C Hamanocb39aea2010-05-09 07:24:48920and re-run the textconv filter. If you want to invalidate the
921cache manually (e.g., because your version of "exif" was updated
922and now produces better output), you can remove the cache
923manually with `git update-ref -d refs/notes/textconv/jpg` (where
924"jpg" is the name of the diff driver, as in the example above).
Junio C Hamano28363492008-11-14 08:26:31925
Junio C Hamanof93530e2011-05-25 23:59:59926Choosing textconv versus external diff
927^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
928
929If you want to show differences between binary or specially-formatted
930blobs in your repository, you can choose to use either an external diff
931command, or to use textconv to convert them to a diff-able text format.
932Which method you choose depends on your exact situation.
933
934The advantage of using an external diff command is flexibility. You are
935not bound to find line-oriented changes, nor is it necessary for the
936output to resemble unified diff. You are free to locate and report
937changes in the most appropriate way for your data format.
938
939A textconv, by comparison, is much more limiting. You provide a
Junio C Hamano076ffcc2013-02-06 05:13:21940transformation of the data into a line-oriented text format, and Git
Junio C Hamanof93530e2011-05-25 23:59:59941uses its regular diff tools to generate the output. There are several
942advantages to choosing this method:
943
9441. Ease of use. It is often much simpler to write a binary to text
945 transformation than it is to perform your own diff. In many cases,
946 existing programs can be used as textconv filters (e.g., exif,
947 odt2txt).
948
9492. Git diff features. By performing only the transformation step
Junio C Hamano076ffcc2013-02-06 05:13:21950 yourself, you can still utilize many of Git's diff features,
Junio C Hamanof93530e2011-05-25 23:59:59951 including colorization, word-diff, and combined diffs for merges.
952
9533. Caching. Textconv caching can speed up repeated diffs, such as those
954 you might trigger by running `git log -p`.
955
956
Junio C Hamano9b6fafe2011-01-14 00:43:22957Marking files as binary
958^^^^^^^^^^^^^^^^^^^^^^^
959
960Git usually guesses correctly whether a blob contains text or binary
961data by examining the beginning of the contents. However, sometimes you
962may want to override its decision, either because a blob contains binary
963data later in the file, or because the content, while technically
964composed of text characters, is opaque to a human reader. For example,
Junio C Hamanofb5ffde2014-11-04 22:38:56965many postscript files contain only ASCII characters, but produce noisy
Junio C Hamano9b6fafe2011-01-14 00:43:22966and meaningless diffs.
967
968The simplest way to mark a file as binary is to unset the diff
969attribute in the `.gitattributes` file:
970
971------------------------
972*.ps -diff
973------------------------
974
Junio C Hamano076ffcc2013-02-06 05:13:21975This will cause Git to generate `Binary files differ` (or a binary
Junio C Hamano9b6fafe2011-01-14 00:43:22976patch, if binary patches are enabled) instead of a regular diff.
977
978However, one may also want to specify other diff driver attributes. For
979example, you might want to use `textconv` to convert postscript files to
Junio C Hamanofb5ffde2014-11-04 22:38:56980an ASCII representation for human viewing, but otherwise treat them as
Junio C Hamano9b6fafe2011-01-14 00:43:22981binary files. You cannot specify both `-diff` and `diff=ps` attributes.
982The solution is to use the `diff.*.binary` config option:
983
984------------------------
985[diff "ps"]
986 textconv = ps2ascii
987 binary = true
988------------------------
989
Junio C Hamanoe90436a2007-04-22 07:22:13990Performing a three-way merge
991~~~~~~~~~~~~~~~~~~~~~~~~~~~~
992
Junio C Hamanof7e47ee2008-11-02 18:16:45993`merge`
994^^^^^^^
995
Junio C Hamanofa28cb12011-03-19 01:35:35996The attribute `merge` affects how three versions of a file are
Junio C Hamanoe90436a2007-04-22 07:22:13997merged when a file-level merge is necessary during `git merge`,
Junio C Hamano27a128b2009-08-13 01:23:00998and other commands such as `git revert` and `git cherry-pick`.
Junio C Hamanoe90436a2007-04-22 07:22:13999
1000Set::
1001
1002Built-in 3-way merge driver is used to merge the
Junio C Hamanoba4b9282008-07-06 05:20:311003contents in a way similar to 'merge' command of `RCS`
Junio C Hamanoe90436a2007-04-22 07:22:131004suite. This is suitable for ordinary text files.
1005
1006Unset::
1007
1008Take the version from the current branch as the
1009tentative merge result, and declare that the merge has
Junio C Hamanofa28cb12011-03-19 01:35:351010conflicts. This is suitable for binary files that do
Junio C Hamanoe90436a2007-04-22 07:22:131011not have a well-defined merge semantics.
1012
1013Unspecified::
1014
1015By default, this uses the same built-in 3-way merge
Junio C Hamanofa28cb12011-03-19 01:35:351016driver as is the case when the `merge` attribute is set.
1017However, the `merge.default` configuration variable can name
1018different merge driver to be used with paths for which the
Junio C Hamanoe90436a2007-04-22 07:22:131019`merge` attribute is unspecified.
1020
Junio C Hamano9db95ca2007-04-23 07:27:051021String::
Junio C Hamanoe90436a2007-04-22 07:22:131022
10233-way merge is performed using the specified custom
1024merge driver. The built-in 3-way merge driver can be
1025explicitly specified by asking for "text" driver; the
1026built-in "take the current branch" driver can be
Junio C Hamano22572e72007-04-25 05:59:251027requested with "binary".
Junio C Hamanoe90436a2007-04-22 07:22:131028
1029
Junio C Hamanof556fc22007-12-23 08:16:381030Built-in merge drivers
1031^^^^^^^^^^^^^^^^^^^^^^
1032
1033There are a few built-in low-level merge drivers defined that
1034can be asked for via the `merge` attribute.
1035
1036text::
1037
1038Usual 3-way file level merge for text files. Conflicted
1039regions are marked with conflict markers `<<<<<<<`,
1040`=======` and `>>>>>>>`. The version from your branch
1041appears before the `=======` marker, and the version
1042from the merged branch appears after the `=======`
1043marker.
1044
1045binary::
1046
1047Keep the version from your branch in the work tree, but
1048leave the path in the conflicted state for the user to
1049sort out.
1050
1051union::
1052
1053Run 3-way file level merge for text files, but take
1054lines from both versions, instead of leaving conflict
1055markers. This tends to leave the added lines in the
1056resulting file in random order and the user should
1057verify the result. Do not use this if you do not
1058understand the implications.
1059
1060
Junio C Hamanoe90436a2007-04-22 07:22:131061Defining a custom merge driver
1062^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1063
Junio C Hamanof556fc22007-12-23 08:16:381064The definition of a merge driver is done in the `.git/config`
1065file, not in the `gitattributes` file, so strictly speaking this
1066manual page is a wrong place to talk about it. However...
Junio C Hamanoe90436a2007-04-22 07:22:131067
1068To define a custom merge driver `filfre`, add a section to your
1069`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
1070
1071----------------------------------------------------------------
1072[merge "filfre"]
1073name = feel-free merge driver
Junio C Hamanodf5384b2015-06-24 21:12:121074driver = filfre %O %A %B %L %P
Junio C Hamanoe90436a2007-04-22 07:22:131075recursive = binary
1076----------------------------------------------------------------
1077
1078The `merge.*.name` variable gives the driver a human-readable
1079name.
1080
1081The `merge.*.driver` variable's value is used to construct a
1082command to run to merge ancestor's version (`%O`), current
1083version (`%A`) and the other branches' version (`%B`). These
1084three tokens are replaced with the names of temporary files that
1085hold the contents of these versions when the command line is
Junio C Hamano86660db2010-02-24 01:12:541086built. Additionally, %L will be replaced with the conflict marker
1087size (see below).
Junio C Hamanoe90436a2007-04-22 07:22:131088
1089The merge driver is expected to leave the result of the merge in
1090the file named with `%A` by overwriting it, and exit with zero
1091status if it managed to merge them cleanly, or non-zero if there
1092were conflicts.
1093
1094The `merge.*.recursive` variable specifies what other merge
1095driver to use when the merge driver is called for an internal
1096merge between common ancestors, when there are more than one.
1097When left unspecified, the driver itself is used for both
1098internal merge and the final merge.
1099
Junio C Hamanodf5384b2015-06-24 21:12:121100The merge driver can learn the pathname in which the merged result
1101will be stored via placeholder `%P`.
1102
Junio C Hamanoe90436a2007-04-22 07:22:131103
Junio C Hamano1aa40d22010-01-21 17:46:431104`conflict-marker-size`
1105^^^^^^^^^^^^^^^^^^^^^^
1106
1107This attribute controls the length of conflict markers left in
1108the work tree file during a conflicted merge. Only setting to
1109the value to a positive integer has any meaningful effect.
1110
1111For example, this line in `.gitattributes` can be used to tell the merge
1112machinery to leave much longer (instead of the usual 7-character-long)
1113conflict markers when merging the file `Documentation/git-merge.txt`
1114results in a conflict.
1115
1116------------------------
1117Documentation/git-merge.txt conflict-marker-size=32
1118------------------------
1119
1120
Junio C Hamano942b35e2007-12-09 10:19:331121Checking whitespace errors
1122~~~~~~~~~~~~~~~~~~~~~~~~~~
1123
1124`whitespace`
1125^^^^^^^^^^^^
1126
1127The `core.whitespace` configuration variable allows you to define what
Junio C Hamanoba4b9282008-07-06 05:20:311128'diff' and 'apply' should consider whitespace errors for all paths in
Junio C Hamano35738e82008-01-07 07:55:461129the project (See linkgit:git-config[1]). This attribute gives you finer
Junio C Hamano942b35e2007-12-09 10:19:331130control per path.
1131
1132Set::
1133
Junio C Hamano076ffcc2013-02-06 05:13:211134Notice all types of potential whitespace errors known to Git.
Junio C Hamanoeef01fe2010-12-13 08:31:581135The tab width is taken from the value of the `core.whitespace`
1136configuration variable.
Junio C Hamano942b35e2007-12-09 10:19:331137
1138Unset::
1139
1140Do not notice anything as error.
1141
1142Unspecified::
1143
Junio C Hamanoeef01fe2010-12-13 08:31:581144Use the value of the `core.whitespace` configuration variable to
Junio C Hamano942b35e2007-12-09 10:19:331145decide what to notice as error.
1146
1147String::
1148
1149Specify a comma separate list of common whitespace problems to
Junio C Hamanoeef01fe2010-12-13 08:31:581150notice in the same format as the `core.whitespace` configuration
Junio C Hamano942b35e2007-12-09 10:19:331151variable.
1152
1153
Junio C Hamanoba4b9282008-07-06 05:20:311154Creating an archive
1155~~~~~~~~~~~~~~~~~~~
1156
1157`export-ignore`
1158^^^^^^^^^^^^^^^
1159
1160Files and directories with the attribute `export-ignore` won't be added to
1161archive files.
1162
1163`export-subst`
1164^^^^^^^^^^^^^^
1165
Junio C Hamano076ffcc2013-02-06 05:13:211166If the attribute `export-subst` is set for a file then Git will expand
Junio C Hamanoba4b9282008-07-06 05:20:311167several placeholders when adding this file to an archive. The
1168expansion depends on the availability of a commit ID, i.e., if
1169linkgit:git-archive[1] has been given a tree instead of a commit or a
1170tag then no replacement will be done. The placeholders are the same
1171as those for the option `--pretty=format:` of linkgit:git-log[1],
1172except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
1173in the file. E.g. the string `$Format:%H$` will be replaced by the
1174commit hash.
1175
1176
Junio C Hamanoa10d8d22009-10-22 03:09:051177Packing objects
1178~~~~~~~~~~~~~~~
1179
1180`delta`
1181^^^^^^^
1182
1183Delta compression will not be attempted for blobs for paths with the
1184attribute `delta` set to false.
1185
1186
Junio C Hamanod3452a02008-11-15 08:07:551187Viewing files in GUI tools
1188~~~~~~~~~~~~~~~~~~~~~~~~~~
1189
1190`encoding`
1191^^^^^^^^^^
1192
1193The value of this attribute specifies the character encoding that should
1194be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to
1195display the contents of the relevant file. Note that due to performance
1196considerations linkgit:gitk[1] does not use this attribute unless you
1197manually enable per-file encodings in its options.
1198
1199If this attribute is not set or has an invalid value, the value of the
1200`gui.encoding` configuration variable is used instead
1201(See linkgit:git-config[1]).
1202
1203
Junio C Hamano86d84362011-08-04 00:21:511204USING MACRO ATTRIBUTES
Junio C Hamanofcb740a2008-08-31 06:32:051205----------------------
1206
1207You do not want any end-of-line conversions applied to, nor textual diffs
1208produced for, any binary file you track. You would need to specify e.g.
1209
1210------------
Junio C Hamanobb88cf42010-06-21 15:23:551211*.jpg -text -diff
Junio C Hamanofcb740a2008-08-31 06:32:051212------------
1213
1214but that may become cumbersome, when you have many attributes. Using
Junio C Hamano86d84362011-08-04 00:21:511215macro attributes, you can define an attribute that, when set, also
1216sets or unsets a number of other attributes at the same time. The
1217system knows a built-in macro attribute, `binary`:
Junio C Hamanofcb740a2008-08-31 06:32:051218
1219------------
1220*.jpg binary
1221------------
1222
Junio C Hamano86d84362011-08-04 00:21:511223Setting the "binary" attribute also unsets the "text" and "diff"
1224attributes as above. Note that macro attributes can only be "Set",
1225though setting one might have the effect of setting or unsetting other
1226attributes or even returning other attributes to the "Unspecified"
1227state.
Junio C Hamanofcb740a2008-08-31 06:32:051228
1229
Junio C Hamano86d84362011-08-04 00:21:511230DEFINING MACRO ATTRIBUTES
Junio C Hamanofcb740a2008-08-31 06:32:051231-------------------------
1232
Junio C Hamanoc5bd79e2014-01-27 21:31:261233Custom macro attributes can be defined only in top-level gitattributes
1234files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
1235top level of the working tree, or the global or system-wide
1236gitattributes files), not in `.gitattributes` files in working tree
1237subdirectories. The built-in macro attribute "binary" is equivalent
1238to:
Junio C Hamanofcb740a2008-08-31 06:32:051239
1240------------
Junio C Hamanoa3cfb762012-09-15 05:32:141241[attr]binary -diff -merge -text
Junio C Hamanofcb740a2008-08-31 06:32:051242------------
1243
1244
Junio C Hamanob9d9d902018-05-23 07:07:421245EXAMPLES
1246--------
Junio C Hamanoe90436a2007-04-22 07:22:131247
1248If you have these three `gitattributes` file:
1249
1250----------------------------------------------------------------
1251(in $GIT_DIR/info/attributes)
1252
1253a* foo !bar -baz
1254
1255(in .gitattributes)
1256abc foo bar baz
1257
1258(in t/.gitattributes)
1259ab* merge=filfre
1260abc -foo -bar
1261*.c frotz
1262----------------------------------------------------------------
1263
1264the attributes given to path `t/abc` are computed as follows:
1265
12661. By examining `t/.gitattributes` (which is in the same
Junio C Hamano076ffcc2013-02-06 05:13:211267 directory as the path in question), Git finds that the first
Junio C Hamanoe90436a2007-04-22 07:22:131268 line matches. `merge` attribute is set. It also finds that
1269 the second line matches, and attributes `foo` and `bar`
1270 are unset.
1271
12722. Then it examines `.gitattributes` (which is in the parent
1273 directory), and finds that the first line matches, but
1274 `t/.gitattributes` file already decided how `merge`, `foo`
1275 and `bar` attributes should be given to this path, so it
1276 leaves `foo` and `bar` unset. Attribute `baz` is set.
1277
Junio C Hamanobdeff822007-07-30 09:07:1712783. Finally it examines `$GIT_DIR/info/attributes`. This file
Junio C Hamanoe90436a2007-04-22 07:22:131279 is used to override the in-tree settings. The first line is
1280 a match, and `foo` is set, `bar` is reverted to unspecified
1281 state, and `baz` is unset.
1282
Junio C Hamanoa6387422007-08-25 03:54:271283As the result, the attributes assignment to `t/abc` becomes:
Junio C Hamanoe90436a2007-04-22 07:22:131284
1285----------------------------------------------------------------
1286foo set to true
1287bar unspecified
1288baz set to false
1289merge set to string value "filfre"
1290frotz unspecified
1291----------------------------------------------------------------
1292
1293
Junio C Hamanof7279012011-08-18 06:13:131294SEE ALSO
1295--------
1296linkgit:git-check-attr[1].
Junio C Hamanoef4c2d12007-09-10 08:11:271297
Junio C Hamanoe90436a2007-04-22 07:22:131298GIT
1299---
Junio C Hamanof7c042d2008-06-06 22:50:531300Part of the linkgit:git[1] suite