]>
Commit | Line | Data |
---|---|---|
88e7fdf2 JH |
1 | gitattributes(5) |
2 | ================ | |
3 | ||
4 | NAME | |
5 | ---- | |
6 | gitattributes - defining attributes per path | |
7 | ||
8 | SYNOPSIS | |
9 | -------- | |
e5b5c1d2 | 10 | $GIT_DIR/info/attributes, .gitattributes |
88e7fdf2 JH |
11 | |
12 | ||
13 | DESCRIPTION | |
14 | ----------- | |
15 | ||
16 | A `gitattributes` file is a simple text file that gives | |
17 | `attributes` to pathnames. | |
18 | ||
19 | Each line in `gitattributes` file is of form: | |
20 | ||
3f74c8e8 | 21 | pattern attr1 attr2 ... |
88e7fdf2 | 22 | |
3f74c8e8 JS |
23 | That is, a pattern followed by an attributes list, |
24 | separated by whitespaces. When the pattern matches the | |
88e7fdf2 JH |
25 | path in question, the attributes listed on the line are given to |
26 | the path. | |
27 | ||
28 | Each attribute can be in one of these states for a given path: | |
29 | ||
30 | Set:: | |
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 | ||
36 | Unset:: | |
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 | ||
42 | Set 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 | ||
49 | Unspecified:: | |
50 | ||
3f74c8e8 | 51 | No pattern matches the path, and nothing says if |
b9d14ffb JH |
52 | the path has or does not have the attribute, the |
53 | attribute for the path is said to be Unspecified. | |
88e7fdf2 | 54 | |
3f74c8e8 | 55 | When more than one pattern matches the path, a later line |
b9d14ffb | 56 | overrides an earlier line. This overriding is done per |
3f74c8e8 JS |
57 | attribute. The rules how the pattern matches paths are the |
58 | same as in `.gitignore` files; see linkgit:gitignore[5]. | |
88e7fdf2 JH |
59 | |
60 | When deciding what attributes are assigned to a path, git | |
61 | consults `$GIT_DIR/info/attributes` file (which has the highest | |
62 | precedence), `.gitattributes` file in the same directory as the | |
20ff3ec2 JM |
63 | path in question, and its parent directories up to the toplevel of the |
64 | work tree (the further the directory that contains `.gitattributes` | |
65 | is from the path in question, the lower its precedence). | |
88e7fdf2 | 66 | |
90b22907 JK |
67 | If you wish to affect only a single repository (i.e., to assign |
68 | attributes to files that are particular to one user's workflow), then | |
69 | attributes should be placed in the `$GIT_DIR/info/attributes` file. | |
70 | Attributes which should be version-controlled and distributed to other | |
71 | repositories (i.e., attributes of interest to all users) should go into | |
72 | `.gitattributes` files. | |
73 | ||
88e7fdf2 JH |
74 | Sometimes you would need to override an setting of an attribute |
75 | for a path to `unspecified` state. This can be done by listing | |
76 | the name of the attribute prefixed with an exclamation point `!`. | |
77 | ||
78 | ||
79 | EFFECTS | |
80 | ------- | |
81 | ||
82 | Certain operations by git can be influenced by assigning | |
ae7aa499 JH |
83 | particular attributes to a path. Currently, the following |
84 | operations are attributes-aware. | |
88e7fdf2 JH |
85 | |
86 | Checking-out and checking-in | |
87 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
88 | ||
3fed15f5 | 89 | These attributes affect how the contents stored in the |
88e7fdf2 | 90 | repository are copied to the working tree files when commands |
0b444cdb | 91 | such as 'git checkout' and 'git merge' run. They also affect how |
88e7fdf2 | 92 | git stores the contents you prepare in the working tree in the |
0b444cdb | 93 | repository upon 'git add' and 'git commit'. |
88e7fdf2 | 94 | |
5ec3e670 | 95 | `text` |
3fed15f5 JH |
96 | ^^^^^^ |
97 | ||
fd6cce9e EB |
98 | This attribute enables and controls end-of-line normalization. When a |
99 | text file is normalized, its line endings are converted to LF in the | |
100 | repository. To control what line ending style is used in the working | |
101 | directory, use the `eol` attribute for a single file and the | |
102 | `core.autocrlf` configuration variable for all text files. | |
3fed15f5 | 103 | |
88e7fdf2 JH |
104 | Set:: |
105 | ||
5ec3e670 | 106 | Setting the `text` attribute on a path enables end-of-line |
fd6cce9e EB |
107 | normalization and marks the path as a text file. End-of-line |
108 | conversion takes place without guessing the content type. | |
88e7fdf2 JH |
109 | |
110 | Unset:: | |
111 | ||
5ec3e670 | 112 | Unsetting the `text` attribute on a path tells git not to |
bbb896d8 | 113 | attempt any end-of-line conversion upon checkin or checkout. |
88e7fdf2 | 114 | |
fd6cce9e | 115 | Set to string value "auto":: |
88e7fdf2 | 116 | |
5ec3e670 | 117 | When `text` is set to "auto", the path is marked for automatic |
fd6cce9e EB |
118 | end-of-line normalization. If git decides that the content is |
119 | text, its line endings are normalized to LF on checkin. | |
88e7fdf2 | 120 | |
fd6cce9e | 121 | Unspecified:: |
88e7fdf2 | 122 | |
5ec3e670 | 123 | If the `text` attribute is unspecified, git uses the `eol` |
fd6cce9e EB |
124 | attribute and the `core.autocrlf` configuration variable to |
125 | determine if the file should be converted. | |
126 | ||
5ec3e670 | 127 | Any other value causes git to act as if `text` has been left |
fd6cce9e EB |
128 | unspecified. |
129 | ||
130 | `eol` | |
131 | ^^^^^ | |
132 | ||
133 | This attribute sets a specific line-ending style to be used in the | |
134 | working directory. It enables end-of-line normalization without any | |
5ec3e670 | 135 | content checks, similar to setting the `text` attribute. |
fd6cce9e EB |
136 | |
137 | Set to string value "crlf":: | |
138 | ||
139 | This setting forces git to normalize line endings on checkin | |
140 | and convert them to CRLF when the file is checked out, | |
5ec3e670 | 141 | regardless of `text` and `core.autocrlf`. |
fd6cce9e EB |
142 | |
143 | Set to string value "lf":: | |
144 | ||
145 | This setting forces git to normalize line endings to LF on | |
146 | checkin and prevents conversion to CRLF when the file is | |
5ec3e670 EB |
147 | checked out, regardless of `text` and `core.autocrlf`. |
148 | ||
149 | Backwards compatibility with `crlf` attribute | |
150 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
151 | ||
152 | For backwards compatibility, the `crlf` attribute is interpreted as | |
153 | follows: | |
154 | ||
155 | ------------------------ | |
156 | crlf text | |
157 | -crlf -text | |
158 | crlf=input eol=lf | |
159 | ------------------------ | |
fd6cce9e EB |
160 | |
161 | End-of-line conversion | |
162 | ^^^^^^^^^^^^^^^^^^^^^^ | |
163 | ||
164 | While git normally leaves file contents alone, it can be configured to | |
165 | normalize line endings to LF in the repository and, optionally, to | |
166 | convert them to CRLF when files are checked out. | |
167 | ||
168 | Here is an example that will make git normalize .txt, .vcproj and .sh | |
169 | files, ensure that .vcproj files have CRLF and .sh files have LF in | |
170 | the working directory, and prevent .jpg files from being normalized | |
171 | regardless of their content. | |
172 | ||
173 | ------------------------ | |
5ec3e670 | 174 | *.txt text |
fd6cce9e EB |
175 | *.vcproj eol=crlf |
176 | *.sh eol=lf | |
5ec3e670 | 177 | *.jpg -text |
fd6cce9e EB |
178 | ------------------------ |
179 | ||
180 | Other source code management systems normalize all text files in their | |
181 | repositories, and there are two ways to enable similar automatic | |
182 | normalization in git. | |
183 | ||
184 | If you simply want to have CRLF line endings in your working directory | |
185 | regardless of the repository you are working with, you can set the | |
186 | config variable "core.autocrlf" without changing any attributes. | |
187 | ||
188 | ------------------------ | |
189 | [core] | |
190 | autocrlf = true | |
191 | ------------------------ | |
192 | ||
193 | This does not force normalization of all text files, but does ensure | |
194 | that text files that you introduce to the repository have their line | |
195 | endings normalized to LF when they are added, and that files that are | |
196 | already normalized in the repository stay normalized. You can also | |
197 | set `autocrlf` to "input" to have automatic normalization of new text | |
198 | files without conversion to CRLF in the working directory. | |
199 | ||
200 | If you want to interoperate with a source code management system that | |
201 | enforces end-of-line normalization, or you simply want all text files | |
5ec3e670 | 202 | in your repository to be normalized, you should instead set the `text` |
fd6cce9e EB |
203 | attribute to "auto" for _all_ files. |
204 | ||
205 | ------------------------ | |
5ec3e670 | 206 | * text=auto |
fd6cce9e EB |
207 | ------------------------ |
208 | ||
209 | This ensures that all files that git considers to be text will have | |
210 | normalized (LF) line endings in the repository. | |
211 | ||
5ec3e670 | 212 | NOTE: When `text=auto` normalization is enabled in an existing |
fd6cce9e EB |
213 | repository, any text files containing CRLFs should be normalized. If |
214 | they are not they will be normalized the next time someone tries to | |
215 | change them, causing unfortunate misattribution. From a clean working | |
216 | directory: | |
217 | ||
218 | ------------------------------------------------- | |
5ec3e670 | 219 | $ echo "* text=auto" >>.gitattributes |
fd6cce9e EB |
220 | $ rm .git/index # Remove the index to force git to |
221 | $ git reset # re-scan the working directory | |
222 | $ git status # Show files that will be normalized | |
223 | $ git add -u | |
224 | $ git add .gitattributes | |
225 | $ git commit -m "Introduce end-of-line normalization" | |
226 | ------------------------------------------------- | |
227 | ||
228 | If any files that should not be normalized show up in 'git status', | |
5ec3e670 | 229 | unset their `text` attribute before running 'git add -u'. |
fd6cce9e EB |
230 | |
231 | ------------------------ | |
5ec3e670 | 232 | manual.pdf -text |
fd6cce9e EB |
233 | ------------------------ |
234 | ||
235 | Conversely, text files that git does not detect can have normalization | |
236 | enabled manually. | |
237 | ||
238 | ------------------------ | |
5ec3e670 | 239 | weirdchars.txt text |
fd6cce9e | 240 | ------------------------ |
88e7fdf2 | 241 | |
21e5ad50 SP |
242 | If `core.safecrlf` is set to "true" or "warn", git verifies if |
243 | the conversion is reversible for the current setting of | |
244 | `core.autocrlf`. For "true", git rejects irreversible | |
245 | conversions; for "warn", git only prints a warning but accepts | |
246 | an irreversible conversion. The safety triggers to prevent such | |
247 | a conversion done to the files in the work tree, but there are a | |
248 | few exceptions. Even though... | |
249 | ||
0b444cdb | 250 | - 'git add' itself does not touch the files in the work tree, the |
21e5ad50 SP |
251 | next checkout would, so the safety triggers; |
252 | ||
0b444cdb | 253 | - 'git apply' to update a text file with a patch does touch the files |
21e5ad50 SP |
254 | in the work tree, but the operation is about text files and CRLF |
255 | conversion is about fixing the line ending inconsistencies, so the | |
256 | safety does not trigger; | |
257 | ||
0b444cdb TR |
258 | - 'git diff' itself does not touch the files in the work tree, it is |
259 | often run to inspect the changes you intend to next 'git add'. To | |
21e5ad50 SP |
260 | catch potential problems early, safety triggers. |
261 | ||
88e7fdf2 | 262 | |
3fed15f5 JH |
263 | `ident` |
264 | ^^^^^^^ | |
265 | ||
2c850f12 JK |
266 | When the attribute `ident` is set for a path, git replaces |
267 | `$Id$` in the blob object with `$Id:`, followed by the | |
3fed15f5 JH |
268 | 40-character hexadecimal blob object name, followed by a dollar |
269 | sign `$` upon checkout. Any byte sequence that begins with | |
af9b54bb AP |
270 | `$Id:` and ends with `$` in the worktree file is replaced |
271 | with `$Id$` upon check-in. | |
3fed15f5 JH |
272 | |
273 | ||
aa4ed402 JH |
274 | `filter` |
275 | ^^^^^^^^ | |
276 | ||
c05ef938 | 277 | A `filter` attribute can be set to a string value that names a |
aa4ed402 JH |
278 | filter driver specified in the configuration. |
279 | ||
c05ef938 | 280 | A filter driver consists of a `clean` command and a `smudge` |
aa4ed402 | 281 | command, either of which can be left unspecified. Upon |
c05ef938 WC |
282 | checkout, when the `smudge` command is specified, the command is |
283 | fed the blob object from its standard input, and its standard | |
284 | output is used to update the worktree file. Similarly, the | |
285 | `clean` command is used to convert the contents of worktree file | |
286 | upon checkin. | |
aa4ed402 | 287 | |
c05ef938 | 288 | A missing filter driver definition in the config is not an error |
aa4ed402 JH |
289 | but makes the filter a no-op passthru. |
290 | ||
291 | The content filtering is done to massage the content into a | |
292 | shape that is more convenient for the platform, filesystem, and | |
c05ef938 | 293 | the user to use. The key phrase here is "more convenient" and not |
4d84aff3 JS |
294 | "turning something unusable into usable". In other words, the |
295 | intent is that if someone unsets the filter driver definition, | |
296 | or does not have the appropriate filter program, the project | |
297 | should still be usable. | |
aa4ed402 | 298 | |
d79f5d17 NS |
299 | For example, in .gitattributes, you would assign the `filter` |
300 | attribute for paths. | |
301 | ||
302 | ------------------------ | |
303 | *.c filter=indent | |
304 | ------------------------ | |
305 | ||
306 | Then you would define a "filter.indent.clean" and "filter.indent.smudge" | |
307 | configuration in your .git/config to specify a pair of commands to | |
308 | modify the contents of C programs when the source files are checked | |
309 | in ("clean" is run) and checked out (no change is made because the | |
310 | command is "cat"). | |
311 | ||
312 | ------------------------ | |
313 | [filter "indent"] | |
314 | clean = indent | |
315 | smudge = cat | |
316 | ------------------------ | |
317 | ||
aa4ed402 JH |
318 | |
319 | Interaction between checkin/checkout attributes | |
320 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
321 | ||
322 | In the check-in codepath, the worktree file is first converted | |
323 | with `filter` driver (if specified and corresponding driver | |
324 | defined), then the result is processed with `ident` (if | |
5ec3e670 | 325 | specified), and then finally with `text` (again, if specified |
aa4ed402 JH |
326 | and applicable). |
327 | ||
328 | In the check-out codepath, the blob content is first converted | |
5ec3e670 | 329 | with `text`, and then `ident` and fed to `filter`. |
aa4ed402 JH |
330 | |
331 | ||
88e7fdf2 JH |
332 | Generating diff text |
333 | ~~~~~~~~~~~~~~~~~~~~ | |
334 | ||
4f73e240 JN |
335 | `diff` |
336 | ^^^^^^ | |
337 | ||
678852d9 JK |
338 | The attribute `diff` affects how 'git' generates diffs for particular |
339 | files. It can tell git whether to generate a textual patch for the path | |
340 | or to treat the path as a binary file. It can also affect what line is | |
341 | shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an | |
342 | external command to generate the diff, or ask git to convert binary | |
343 | files to a text format before generating the diff. | |
88e7fdf2 JH |
344 | |
345 | Set:: | |
346 | ||
347 | A path to which the `diff` attribute is set is treated | |
348 | as text, even when they contain byte values that | |
349 | normally never appear in text files, such as NUL. | |
350 | ||
351 | Unset:: | |
352 | ||
353 | A path to which the `diff` attribute is unset will | |
678852d9 JK |
354 | generate `Binary files differ` (or a binary patch, if |
355 | binary patches are enabled). | |
88e7fdf2 JH |
356 | |
357 | Unspecified:: | |
358 | ||
359 | A path to which the `diff` attribute is unspecified | |
360 | first gets its contents inspected, and if it looks like | |
361 | text, it is treated as text. Otherwise it would | |
362 | generate `Binary files differ`. | |
363 | ||
2cc3167c JH |
364 | String:: |
365 | ||
678852d9 JK |
366 | Diff is shown using the specified diff driver. Each driver may |
367 | specify one or more options, as described in the following | |
368 | section. The options for the diff driver "foo" are defined | |
369 | by the configuration variables in the "diff.foo" section of the | |
370 | git config file. | |
2cc3167c JH |
371 | |
372 | ||
678852d9 JK |
373 | Defining an external diff driver |
374 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
2cc3167c JH |
375 | |
376 | The definition of a diff driver is done in `gitconfig`, not | |
377 | `gitattributes` file, so strictly speaking this manual page is a | |
378 | wrong place to talk about it. However... | |
379 | ||
678852d9 | 380 | To define an external diff driver `jcdiff`, add a section to your |
2cc3167c JH |
381 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
382 | ||
383 | ---------------------------------------------------------------- | |
384 | [diff "jcdiff"] | |
385 | command = j-c-diff | |
386 | ---------------------------------------------------------------- | |
387 | ||
388 | When git needs to show you a diff for the path with `diff` | |
389 | attribute set to `jcdiff`, it calls the command you specified | |
390 | with the above configuration, i.e. `j-c-diff`, with 7 | |
391 | parameters, just like `GIT_EXTERNAL_DIFF` program is called. | |
9e1f0a85 | 392 | See linkgit:git[1] for details. |
88e7fdf2 JH |
393 | |
394 | ||
ae7aa499 JH |
395 | Defining a custom hunk-header |
396 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
397 | ||
c882c01e | 398 | Each group of changes (called a "hunk") in the textual diff output |
ae7aa499 JH |
399 | is prefixed with a line of the form: |
400 | ||
401 | @@ -k,l +n,m @@ TEXT | |
402 | ||
c882c01e GD |
403 | This is called a 'hunk header'. The "TEXT" portion is by default a line |
404 | that begins with an alphabet, an underscore or a dollar sign; this | |
405 | matches what GNU 'diff -p' output uses. This default selection however | |
406 | is not suited for some contents, and you can use a customized pattern | |
407 | to make a selection. | |
ae7aa499 | 408 | |
c882c01e | 409 | First, in .gitattributes, you would assign the `diff` attribute |
ae7aa499 JH |
410 | for paths. |
411 | ||
412 | ------------------------ | |
413 | *.tex diff=tex | |
414 | ------------------------ | |
415 | ||
edb7e82f | 416 | Then, you would define a "diff.tex.xfuncname" configuration to |
ae7aa499 | 417 | specify a regular expression that matches a line that you would |
c4c86d23 JK |
418 | want to appear as the hunk header "TEXT". Add a section to your |
419 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
ae7aa499 JH |
420 | |
421 | ------------------------ | |
422 | [diff "tex"] | |
45d9414f | 423 | xfuncname = "^(\\\\(sub)*section\\{.*)$" |
ae7aa499 JH |
424 | ------------------------ |
425 | ||
426 | Note. A single level of backslashes are eaten by the | |
427 | configuration file parser, so you would need to double the | |
428 | backslashes; the pattern above picks a line that begins with a | |
02783075 | 429 | backslash, and zero or more occurrences of `sub` followed by |
ae7aa499 JH |
430 | `section` followed by open brace, to the end of line. |
431 | ||
432 | There are a few built-in patterns to make this easier, and `tex` | |
433 | is one of them, so you do not have to write the above in your | |
434 | configuration file (you still need to enable this with the | |
d08ed6d6 GH |
435 | attribute mechanism, via `.gitattributes`). The following built in |
436 | patterns are available: | |
437 | ||
23b5beb2 GH |
438 | - `bibtex` suitable for files with BibTeX coded references. |
439 | ||
80c49c3d TR |
440 | - `cpp` suitable for source code in the C and C++ languages. |
441 | ||
af9ce1ff AE |
442 | - `html` suitable for HTML/XHTML documents. |
443 | ||
b66e00f1 | 444 | - `java` suitable for source code in the Java language. |
d08ed6d6 | 445 | |
5d1e958e JS |
446 | - `objc` suitable for source code in the Objective-C language. |
447 | ||
d08ed6d6 GH |
448 | - `pascal` suitable for source code in the Pascal/Delphi language. |
449 | ||
af9ce1ff AE |
450 | - `php` suitable for source code in the PHP language. |
451 | ||
7c17205b KS |
452 | - `python` suitable for source code in the Python language. |
453 | ||
d08ed6d6 GH |
454 | - `ruby` suitable for source code in the Ruby language. |
455 | ||
456 | - `tex` suitable for source code for LaTeX documents. | |
ae7aa499 JH |
457 | |
458 | ||
80c49c3d TR |
459 | Customizing word diff |
460 | ^^^^^^^^^^^^^^^^^^^^^ | |
461 | ||
462 | You can customize the rules that `git diff --color-words` uses to | |
463 | split words in a line, by specifying an appropriate regular expression | |
ae3b970a | 464 | in the "diff.*.wordRegex" configuration variable. For example, in TeX |
80c49c3d TR |
465 | a backslash followed by a sequence of letters forms a command, but |
466 | several such commands can be run together without intervening | |
c4c86d23 JK |
467 | whitespace. To separate them, use a regular expression in your |
468 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
80c49c3d TR |
469 | |
470 | ------------------------ | |
471 | [diff "tex"] | |
ae3b970a | 472 | wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" |
80c49c3d TR |
473 | ------------------------ |
474 | ||
475 | A built-in pattern is provided for all languages listed in the | |
476 | previous section. | |
477 | ||
478 | ||
678852d9 JK |
479 | Performing text diffs of binary files |
480 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
481 | ||
482 | Sometimes it is desirable to see the diff of a text-converted | |
483 | version of some binary files. For example, a word processor | |
484 | document can be converted to an ASCII text representation, and | |
485 | the diff of the text shown. Even though this conversion loses | |
486 | some information, the resulting diff is useful for human | |
487 | viewing (but cannot be applied directly). | |
488 | ||
489 | The `textconv` config option is used to define a program for | |
490 | performing such a conversion. The program should take a single | |
491 | argument, the name of a file to convert, and produce the | |
492 | resulting text on stdout. | |
493 | ||
494 | For example, to show the diff of the exif information of a | |
495 | file instead of the binary information (assuming you have the | |
c4c86d23 JK |
496 | exif tool installed), add the following section to your |
497 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file): | |
678852d9 JK |
498 | |
499 | ------------------------ | |
500 | [diff "jpg"] | |
501 | textconv = exif | |
502 | ------------------------ | |
503 | ||
504 | NOTE: The text conversion is generally a one-way conversion; | |
505 | in this example, we lose the actual image contents and focus | |
506 | just on the text data. This means that diffs generated by | |
507 | textconv are _not_ suitable for applying. For this reason, | |
508 | only `git diff` and the `git log` family of commands (i.e., | |
509 | log, whatchanged, show) will perform text conversion. `git | |
510 | format-patch` will never generate this output. If you want to | |
511 | send somebody a text-converted diff of a binary file (e.g., | |
512 | because it quickly conveys the changes you have made), you | |
513 | should generate it separately and send it as a comment _in | |
514 | addition to_ the usual binary diff that you might send. | |
515 | ||
516 | ||
88e7fdf2 JH |
517 | Performing a three-way merge |
518 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
519 | ||
4f73e240 JN |
520 | `merge` |
521 | ^^^^^^^ | |
522 | ||
88e7fdf2 JH |
523 | The attribute `merge` affects how three versions of a file is |
524 | merged when a file-level merge is necessary during `git merge`, | |
57f6ec02 | 525 | and other commands such as `git revert` and `git cherry-pick`. |
88e7fdf2 JH |
526 | |
527 | Set:: | |
528 | ||
529 | Built-in 3-way merge driver is used to merge the | |
2fd02c92 | 530 | contents in a way similar to 'merge' command of `RCS` |
88e7fdf2 JH |
531 | suite. This is suitable for ordinary text files. |
532 | ||
533 | Unset:: | |
534 | ||
535 | Take the version from the current branch as the | |
536 | tentative merge result, and declare that the merge has | |
537 | conflicts. This is suitable for binary files that does | |
538 | not have a well-defined merge semantics. | |
539 | ||
540 | Unspecified:: | |
541 | ||
542 | By default, this uses the same built-in 3-way merge | |
543 | driver as is the case the `merge` attribute is set. | |
544 | However, `merge.default` configuration variable can name | |
545 | different merge driver to be used for paths to which the | |
546 | `merge` attribute is unspecified. | |
547 | ||
2cc3167c | 548 | String:: |
88e7fdf2 JH |
549 | |
550 | 3-way merge is performed using the specified custom | |
551 | merge driver. The built-in 3-way merge driver can be | |
552 | explicitly specified by asking for "text" driver; the | |
553 | built-in "take the current branch" driver can be | |
b9d14ffb | 554 | requested with "binary". |
88e7fdf2 JH |
555 | |
556 | ||
0e545f75 JH |
557 | Built-in merge drivers |
558 | ^^^^^^^^^^^^^^^^^^^^^^ | |
559 | ||
560 | There are a few built-in low-level merge drivers defined that | |
561 | can be asked for via the `merge` attribute. | |
562 | ||
563 | text:: | |
564 | ||
565 | Usual 3-way file level merge for text files. Conflicted | |
566 | regions are marked with conflict markers `<<<<<<<`, | |
567 | `=======` and `>>>>>>>`. The version from your branch | |
568 | appears before the `=======` marker, and the version | |
569 | from the merged branch appears after the `=======` | |
570 | marker. | |
571 | ||
572 | binary:: | |
573 | ||
574 | Keep the version from your branch in the work tree, but | |
575 | leave the path in the conflicted state for the user to | |
576 | sort out. | |
577 | ||
578 | union:: | |
579 | ||
580 | Run 3-way file level merge for text files, but take | |
581 | lines from both versions, instead of leaving conflict | |
582 | markers. This tends to leave the added lines in the | |
583 | resulting file in random order and the user should | |
584 | verify the result. Do not use this if you do not | |
585 | understand the implications. | |
586 | ||
587 | ||
88e7fdf2 JH |
588 | Defining a custom merge driver |
589 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
590 | ||
0e545f75 JH |
591 | The definition of a merge driver is done in the `.git/config` |
592 | file, not in the `gitattributes` file, so strictly speaking this | |
593 | manual page is a wrong place to talk about it. However... | |
88e7fdf2 JH |
594 | |
595 | To define a custom merge driver `filfre`, add a section to your | |
596 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
597 | ||
598 | ---------------------------------------------------------------- | |
599 | [merge "filfre"] | |
600 | name = feel-free merge driver | |
601 | driver = filfre %O %A %B | |
602 | recursive = binary | |
603 | ---------------------------------------------------------------- | |
604 | ||
605 | The `merge.*.name` variable gives the driver a human-readable | |
606 | name. | |
607 | ||
608 | The `merge.*.driver` variable's value is used to construct a | |
609 | command to run to merge ancestor's version (`%O`), current | |
610 | version (`%A`) and the other branches' version (`%B`). These | |
611 | three tokens are replaced with the names of temporary files that | |
612 | hold the contents of these versions when the command line is | |
613 | built. | |
614 | ||
615 | The merge driver is expected to leave the result of the merge in | |
616 | the file named with `%A` by overwriting it, and exit with zero | |
617 | status if it managed to merge them cleanly, or non-zero if there | |
618 | were conflicts. | |
619 | ||
620 | The `merge.*.recursive` variable specifies what other merge | |
621 | driver to use when the merge driver is called for an internal | |
622 | merge between common ancestors, when there are more than one. | |
623 | When left unspecified, the driver itself is used for both | |
624 | internal merge and the final merge. | |
625 | ||
626 | ||
4c734803 JH |
627 | `conflict-marker-size` |
628 | ^^^^^^^^^^^^^^^^^^^^^^ | |
629 | ||
630 | This attribute controls the length of conflict markers left in | |
631 | the work tree file during a conflicted merge. Only setting to | |
632 | the value to a positive integer has any meaningful effect. | |
633 | ||
634 | For example, this line in `.gitattributes` can be used to tell the merge | |
635 | machinery to leave much longer (instead of the usual 7-character-long) | |
636 | conflict markers when merging the file `Documentation/git-merge.txt` | |
637 | results in a conflict. | |
638 | ||
639 | ------------------------ | |
640 | Documentation/git-merge.txt conflict-marker-size=32 | |
641 | ------------------------ | |
642 | ||
643 | ||
cf1b7869 JH |
644 | Checking whitespace errors |
645 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
646 | ||
647 | `whitespace` | |
648 | ^^^^^^^^^^^^ | |
649 | ||
650 | The `core.whitespace` configuration variable allows you to define what | |
2fd02c92 | 651 | 'diff' and 'apply' should consider whitespace errors for all paths in |
5162e697 | 652 | the project (See linkgit:git-config[1]). This attribute gives you finer |
cf1b7869 JH |
653 | control per path. |
654 | ||
655 | Set:: | |
656 | ||
657 | Notice all types of potential whitespace errors known to git. | |
658 | ||
659 | Unset:: | |
660 | ||
661 | Do not notice anything as error. | |
662 | ||
663 | Unspecified:: | |
664 | ||
665 | Use the value of `core.whitespace` configuration variable to | |
666 | decide what to notice as error. | |
667 | ||
668 | String:: | |
669 | ||
670 | Specify a comma separate list of common whitespace problems to | |
671 | notice in the same format as `core.whitespace` configuration | |
672 | variable. | |
673 | ||
674 | ||
8a33dd8b JH |
675 | Creating an archive |
676 | ~~~~~~~~~~~~~~~~~~~ | |
677 | ||
08b51f51 JH |
678 | `export-ignore` |
679 | ^^^^^^^^^^^^^^^ | |
680 | ||
681 | Files and directories with the attribute `export-ignore` won't be added to | |
682 | archive files. | |
683 | ||
8a33dd8b JH |
684 | `export-subst` |
685 | ^^^^^^^^^^^^^^ | |
686 | ||
687 | If the attribute `export-subst` is set for a file then git will expand | |
688 | several placeholders when adding this file to an archive. The | |
08b51f51 | 689 | expansion depends on the availability of a commit ID, i.e., if |
8a33dd8b JH |
690 | linkgit:git-archive[1] has been given a tree instead of a commit or a |
691 | tag then no replacement will be done. The placeholders are the same | |
692 | as those for the option `--pretty=format:` of linkgit:git-log[1], | |
693 | except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` | |
694 | in the file. E.g. the string `$Format:%H$` will be replaced by the | |
695 | commit hash. | |
696 | ||
697 | ||
975457f1 NG |
698 | Packing objects |
699 | ~~~~~~~~~~~~~~~ | |
700 | ||
701 | `delta` | |
702 | ^^^^^^^ | |
703 | ||
704 | Delta compression will not be attempted for blobs for paths with the | |
705 | attribute `delta` set to false. | |
706 | ||
707 | ||
a2df1fb2 AG |
708 | Viewing files in GUI tools |
709 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
710 | ||
711 | `encoding` | |
712 | ^^^^^^^^^^ | |
713 | ||
714 | The value of this attribute specifies the character encoding that should | |
715 | be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to | |
716 | display the contents of the relevant file. Note that due to performance | |
717 | considerations linkgit:gitk[1] does not use this attribute unless you | |
718 | manually enable per-file encodings in its options. | |
719 | ||
720 | If this attribute is not set or has an invalid value, the value of the | |
721 | `gui.encoding` configuration variable is used instead | |
722 | (See linkgit:git-config[1]). | |
723 | ||
724 | ||
bbb896d8 JH |
725 | USING ATTRIBUTE MACROS |
726 | ---------------------- | |
727 | ||
728 | You do not want any end-of-line conversions applied to, nor textual diffs | |
729 | produced for, any binary file you track. You would need to specify e.g. | |
730 | ||
731 | ------------ | |
5ec3e670 | 732 | *.jpg -text -diff |
bbb896d8 JH |
733 | ------------ |
734 | ||
735 | but that may become cumbersome, when you have many attributes. Using | |
736 | attribute macros, you can specify groups of attributes set or unset at | |
737 | the same time. The system knows a built-in attribute macro, `binary`: | |
738 | ||
739 | ------------ | |
740 | *.jpg binary | |
741 | ------------ | |
742 | ||
743 | which is equivalent to the above. Note that the attribute macros can only | |
744 | be "Set" (see the above example that sets "binary" macro as if it were an | |
5ec3e670 | 745 | ordinary attribute --- setting it in turn unsets "text" and "diff"). |
bbb896d8 JH |
746 | |
747 | ||
748 | DEFINING ATTRIBUTE MACROS | |
749 | ------------------------- | |
750 | ||
751 | Custom attribute macros can be defined only in the `.gitattributes` file | |
752 | at the toplevel (i.e. not in any subdirectory). The built-in attribute | |
753 | macro "binary" is equivalent to: | |
754 | ||
755 | ------------ | |
5ec3e670 | 756 | [attr]binary -diff -text |
bbb896d8 JH |
757 | ------------ |
758 | ||
759 | ||
88e7fdf2 JH |
760 | EXAMPLE |
761 | ------- | |
762 | ||
763 | If you have these three `gitattributes` file: | |
764 | ||
765 | ---------------------------------------------------------------- | |
766 | (in $GIT_DIR/info/attributes) | |
767 | ||
768 | a* foo !bar -baz | |
769 | ||
770 | (in .gitattributes) | |
771 | abc foo bar baz | |
772 | ||
773 | (in t/.gitattributes) | |
774 | ab* merge=filfre | |
775 | abc -foo -bar | |
776 | *.c frotz | |
777 | ---------------------------------------------------------------- | |
778 | ||
779 | the attributes given to path `t/abc` are computed as follows: | |
780 | ||
781 | 1. By examining `t/.gitattributes` (which is in the same | |
02783075 | 782 | directory as the path in question), git finds that the first |
88e7fdf2 JH |
783 | line matches. `merge` attribute is set. It also finds that |
784 | the second line matches, and attributes `foo` and `bar` | |
785 | are unset. | |
786 | ||
787 | 2. Then it examines `.gitattributes` (which is in the parent | |
788 | directory), and finds that the first line matches, but | |
789 | `t/.gitattributes` file already decided how `merge`, `foo` | |
790 | and `bar` attributes should be given to this path, so it | |
791 | leaves `foo` and `bar` unset. Attribute `baz` is set. | |
792 | ||
5c759f96 | 793 | 3. Finally it examines `$GIT_DIR/info/attributes`. This file |
88e7fdf2 JH |
794 | is used to override the in-tree settings. The first line is |
795 | a match, and `foo` is set, `bar` is reverted to unspecified | |
796 | state, and `baz` is unset. | |
797 | ||
02783075 | 798 | As the result, the attributes assignment to `t/abc` becomes: |
88e7fdf2 JH |
799 | |
800 | ---------------------------------------------------------------- | |
801 | foo set to true | |
802 | bar unspecified | |
803 | baz set to false | |
804 | merge set to string value "filfre" | |
805 | frotz unspecified | |
806 | ---------------------------------------------------------------- | |
807 | ||
808 | ||
8460b2fc | 809 | |
88e7fdf2 JH |
810 | GIT |
811 | --- | |
9e1f0a85 | 812 | Part of the linkgit:git[1] suite |