Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 1 | gitattributes(5) |
| 2 | ================ |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | gitattributes - defining attributes per path |
| 7 | |
| 8 | SYNOPSIS |
| 9 | -------- |
Junio C Hamano | 17bd227 | 2008-09-01 06:11:17 | [diff] [blame] | 10 | $GIT_DIR/info/attributes, .gitattributes |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 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 | |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 21 | pattern attr1 attr2 ... |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 22 | |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 23 | That is, a pattern followed by an attributes list, |
| 24 | separated by whitespaces. When the pattern matches the |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 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 | |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 51 | No pattern matches the path, and nothing says if |
Junio C Hamano | 22572e7 | 2007-04-25 05:59:25 | [diff] [blame] | 52 | the path has or does not have the attribute, the |
| 53 | attribute for the path is said to be Unspecified. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 54 | |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 55 | When more than one pattern matches the path, a later line |
Junio C Hamano | 22572e7 | 2007-04-25 05:59:25 | [diff] [blame] | 56 | overrides an earlier line. This overriding is done per |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 57 | attribute. The rules how the pattern matches paths are the |
| 58 | same as in `.gitignore` files; see linkgit:gitignore[5]. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 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 |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 63 | path in question, and its parent directories up to the toplevel of the |
| 64 | work tree (the further the directory that contains `.gitattributes` |
Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 65 | is from the path in question, the lower its precedence). Finally |
| 66 | global and system-wide files are considered (they have the lowest |
| 67 | precedence). |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 68 | |
Junio C Hamano | 99dc24a | 2008-03-27 23:49:50 | [diff] [blame] | 69 | If you wish to affect only a single repository (i.e., to assign |
Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 70 | attributes to files that are particular to |
| 71 | one user's workflow for that repository), then |
Junio C Hamano | 99dc24a | 2008-03-27 23:49:50 | [diff] [blame] | 72 | attributes should be placed in the `$GIT_DIR/info/attributes` file. |
| 73 | Attributes which should be version-controlled and distributed to other |
| 74 | repositories (i.e., attributes of interest to all users) should go into |
Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 75 | `.gitattributes` files. Attributes that should affect all repositories |
| 76 | for a single user should be placed in a file specified by the |
| 77 | `core.attributesfile` configuration option (see linkgit:git-config[1]). |
| 78 | Attributes for all users on a system should be placed in the |
| 79 | `$(prefix)/etc/gitattributes` file. |
Junio C Hamano | 99dc24a | 2008-03-27 23:49:50 | [diff] [blame] | 80 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 81 | Sometimes you would need to override an setting of an attribute |
| 82 | for a path to `unspecified` state. This can be done by listing |
| 83 | the name of the attribute prefixed with an exclamation point `!`. |
| 84 | |
| 85 | |
| 86 | EFFECTS |
| 87 | ------- |
| 88 | |
| 89 | Certain operations by git can be influenced by assigning |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 90 | particular attributes to a path. Currently, the following |
| 91 | operations are attributes-aware. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 92 | |
| 93 | Checking-out and checking-in |
| 94 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 95 | |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 96 | These attributes affect how the contents stored in the |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 97 | repository are copied to the working tree files when commands |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 98 | such as 'git checkout' and 'git merge' run. They also affect how |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 99 | git stores the contents you prepare in the working tree in the |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 100 | repository upon 'git add' and 'git commit'. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 101 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 102 | `text` |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 103 | ^^^^^^ |
| 104 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 105 | This attribute enables and controls end-of-line normalization. When a |
| 106 | text file is normalized, its line endings are converted to LF in the |
| 107 | repository. To control what line ending style is used in the working |
| 108 | directory, use the `eol` attribute for a single file and the |
| 109 | `core.eol` configuration variable for all text files. |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 110 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 111 | Set:: |
| 112 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 113 | Setting the `text` attribute on a path enables end-of-line |
| 114 | normalization and marks the path as a text file. End-of-line |
| 115 | conversion takes place without guessing the content type. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 116 | |
| 117 | Unset:: |
| 118 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 119 | Unsetting the `text` attribute on a path tells git not to |
Junio C Hamano | fcb740a | 2008-08-31 06:32:05 | [diff] [blame] | 120 | attempt any end-of-line conversion upon checkin or checkout. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 121 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 122 | Set to string value "auto":: |
| 123 | |
| 124 | When `text` is set to "auto", the path is marked for automatic |
| 125 | end-of-line normalization. If git decides that the content is |
| 126 | text, its line endings are normalized to LF on checkin. |
| 127 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 128 | Unspecified:: |
| 129 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 130 | If the `text` attribute is unspecified, git uses the |
| 131 | `core.autocrlf` configuration variable to determine if the |
| 132 | file should be converted. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 133 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 134 | Any other value causes git to act as if `text` has been left |
| 135 | unspecified. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 136 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 137 | `eol` |
| 138 | ^^^^^ |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 139 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 140 | This attribute sets a specific line-ending style to be used in the |
| 141 | working directory. It enables end-of-line normalization without any |
| 142 | content checks, effectively setting the `text` attribute. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 143 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 144 | Set to string value "crlf":: |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 145 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 146 | This setting forces git to normalize line endings for this |
| 147 | file on checkin and convert them to CRLF when the file is |
| 148 | checked out. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 149 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 150 | Set to string value "lf":: |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 151 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 152 | This setting forces git to normalize line endings to LF on |
| 153 | checkin and prevents conversion to CRLF when the file is |
| 154 | checked out. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 155 | |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 156 | Backwards compatibility with `crlf` attribute |
| 157 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 158 | |
| 159 | For backwards compatibility, the `crlf` attribute is interpreted as |
| 160 | follows: |
| 161 | |
| 162 | ------------------------ |
| 163 | crlf text |
| 164 | -crlf -text |
| 165 | crlf=input eol=lf |
| 166 | ------------------------ |
| 167 | |
| 168 | End-of-line conversion |
| 169 | ^^^^^^^^^^^^^^^^^^^^^^ |
| 170 | |
| 171 | While git normally leaves file contents alone, it can be configured to |
| 172 | normalize line endings to LF in the repository and, optionally, to |
| 173 | convert them to CRLF when files are checked out. |
| 174 | |
| 175 | Here is an example that will make git normalize .txt, .vcproj and .sh |
| 176 | files, ensure that .vcproj files have CRLF and .sh files have LF in |
| 177 | the working directory, and prevent .jpg files from being normalized |
| 178 | regardless of their content. |
| 179 | |
| 180 | ------------------------ |
| 181 | *.txt text |
| 182 | *.vcproj eol=crlf |
| 183 | *.sh eol=lf |
| 184 | *.jpg -text |
| 185 | ------------------------ |
| 186 | |
| 187 | Other source code management systems normalize all text files in their |
| 188 | repositories, and there are two ways to enable similar automatic |
| 189 | normalization in git. |
| 190 | |
| 191 | If you simply want to have CRLF line endings in your working directory |
| 192 | regardless of the repository you are working with, you can set the |
| 193 | config variable "core.autocrlf" without changing any attributes. |
| 194 | |
| 195 | ------------------------ |
| 196 | [core] |
| 197 | autocrlf = true |
| 198 | ------------------------ |
| 199 | |
| 200 | This does not force normalization of all text files, but does ensure |
| 201 | that text files that you introduce to the repository have their line |
| 202 | endings normalized to LF when they are added, and that files that are |
| 203 | already normalized in the repository stay normalized. |
| 204 | |
| 205 | If you want to interoperate with a source code management system that |
| 206 | enforces end-of-line normalization, or you simply want all text files |
| 207 | in your repository to be normalized, you should instead set the `text` |
| 208 | attribute to "auto" for _all_ files. |
| 209 | |
| 210 | ------------------------ |
| 211 | * text=auto |
| 212 | ------------------------ |
| 213 | |
| 214 | This ensures that all files that git considers to be text will have |
| 215 | normalized (LF) line endings in the repository. The `core.eol` |
| 216 | configuration variable controls which line endings git will use for |
| 217 | normalized files in your working directory; the default is to use the |
| 218 | native line ending for your platform, or CRLF if `core.autocrlf` is |
| 219 | set. |
| 220 | |
| 221 | NOTE: When `text=auto` normalization is enabled in an existing |
| 222 | repository, any text files containing CRLFs should be normalized. If |
| 223 | they are not they will be normalized the next time someone tries to |
| 224 | change them, causing unfortunate misattribution. From a clean working |
| 225 | directory: |
| 226 | |
| 227 | ------------------------------------------------- |
| 228 | $ echo "* text=auto" >>.gitattributes |
| 229 | $ rm .git/index # Remove the index to force git to |
| 230 | $ git reset # re-scan the working directory |
| 231 | $ git status # Show files that will be normalized |
| 232 | $ git add -u |
| 233 | $ git add .gitattributes |
| 234 | $ git commit -m "Introduce end-of-line normalization" |
| 235 | ------------------------------------------------- |
| 236 | |
| 237 | If any files that should not be normalized show up in 'git status', |
| 238 | unset their `text` attribute before running 'git add -u'. |
| 239 | |
| 240 | ------------------------ |
| 241 | manual.pdf -text |
| 242 | ------------------------ |
| 243 | |
| 244 | Conversely, text files that git does not detect can have normalization |
| 245 | enabled manually. |
| 246 | |
| 247 | ------------------------ |
| 248 | weirdchars.txt text |
| 249 | ------------------------ |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 250 | |
Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 251 | If `core.safecrlf` is set to "true" or "warn", git verifies if |
| 252 | the conversion is reversible for the current setting of |
| 253 | `core.autocrlf`. For "true", git rejects irreversible |
| 254 | conversions; for "warn", git only prints a warning but accepts |
| 255 | an irreversible conversion. The safety triggers to prevent such |
| 256 | a conversion done to the files in the work tree, but there are a |
| 257 | few exceptions. Even though... |
| 258 | |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 259 | - 'git add' itself does not touch the files in the work tree, the |
Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 260 | next checkout would, so the safety triggers; |
| 261 | |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 262 | - 'git apply' to update a text file with a patch does touch the files |
Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 263 | in the work tree, but the operation is about text files and CRLF |
| 264 | conversion is about fixing the line ending inconsistencies, so the |
| 265 | safety does not trigger; |
| 266 | |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 267 | - 'git diff' itself does not touch the files in the work tree, it is |
| 268 | often run to inspect the changes you intend to next 'git add'. To |
Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 269 | catch potential problems early, safety triggers. |
| 270 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 271 | |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 272 | `ident` |
| 273 | ^^^^^^^ |
| 274 | |
Junio C Hamano | 6f1bbb7 | 2008-10-31 11:32:55 | [diff] [blame] | 275 | When the attribute `ident` is set for a path, git replaces |
| 276 | `$Id$` in the blob object with `$Id:`, followed by the |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 277 | 40-character hexadecimal blob object name, followed by a dollar |
| 278 | sign `$` upon checkout. Any byte sequence that begins with |
Junio C Hamano | 0430e3a | 2007-05-15 03:13:17 | [diff] [blame] | 279 | `$Id:` and ends with `$` in the worktree file is replaced |
| 280 | with `$Id$` upon check-in. |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 281 | |
| 282 | |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 283 | `filter` |
| 284 | ^^^^^^^^ |
| 285 | |
Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 286 | A `filter` attribute can be set to a string value that names a |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 287 | filter driver specified in the configuration. |
| 288 | |
Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 289 | A filter driver consists of a `clean` command and a `smudge` |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 290 | command, either of which can be left unspecified. Upon |
Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 291 | checkout, when the `smudge` command is specified, the command is |
| 292 | fed the blob object from its standard input, and its standard |
| 293 | output is used to update the worktree file. Similarly, the |
| 294 | `clean` command is used to convert the contents of worktree file |
| 295 | upon checkin. |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 296 | |
Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 297 | A missing filter driver definition in the config is not an error |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 298 | but makes the filter a no-op passthru. |
| 299 | |
| 300 | The content filtering is done to massage the content into a |
| 301 | shape that is more convenient for the platform, filesystem, and |
Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 302 | the user to use. The key phrase here is "more convenient" and not |
Junio C Hamano | 4fd58d4 | 2007-09-30 00:51:14 | [diff] [blame] | 303 | "turning something unusable into usable". In other words, the |
| 304 | intent is that if someone unsets the filter driver definition, |
| 305 | or does not have the appropriate filter program, the project |
| 306 | should still be usable. |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 307 | |
Junio C Hamano | 6a548ef | 2009-12-17 00:16:20 | [diff] [blame] | 308 | For example, in .gitattributes, you would assign the `filter` |
| 309 | attribute for paths. |
| 310 | |
| 311 | ------------------------ |
| 312 | *.c filter=indent |
| 313 | ------------------------ |
| 314 | |
| 315 | Then you would define a "filter.indent.clean" and "filter.indent.smudge" |
| 316 | configuration in your .git/config to specify a pair of commands to |
| 317 | modify the contents of C programs when the source files are checked |
| 318 | in ("clean" is run) and checked out (no change is made because the |
| 319 | command is "cat"). |
| 320 | |
| 321 | ------------------------ |
| 322 | [filter "indent"] |
| 323 | clean = indent |
| 324 | smudge = cat |
| 325 | ------------------------ |
| 326 | |
Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 327 | For best results, `clean` should not alter its output further if it is |
| 328 | run twice ("clean->clean" should be equivalent to "clean"), and |
| 329 | multiple `smudge` commands should not alter `clean`'s output |
| 330 | ("smudge->smudge->clean" should be equivalent to "clean"). See the |
| 331 | section on merging below. |
| 332 | |
| 333 | The "indent" filter is well-behaved in this regard: it will not modify |
| 334 | input that is already correctly indented. In this case, the lack of a |
| 335 | smudge filter means that the clean filter _must_ accept its own output |
| 336 | without modifying it. |
| 337 | |
Junio C Hamano | e0552e4 | 2011-01-06 00:34:47 | [diff] [blame] | 338 | Sequence "%f" on the filter command line is replaced with the name of |
| 339 | the file the filter is working on. A filter might use this in keyword |
| 340 | substitution. For example: |
| 341 | |
| 342 | ------------------------ |
| 343 | [filter "p4"] |
| 344 | clean = git-p4-filter --clean %f |
| 345 | smudge = git-p4-filter --smudge %f |
| 346 | ------------------------ |
| 347 | |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 348 | |
| 349 | Interaction between checkin/checkout attributes |
| 350 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 351 | |
| 352 | In the check-in codepath, the worktree file is first converted |
| 353 | with `filter` driver (if specified and corresponding driver |
| 354 | defined), then the result is processed with `ident` (if |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 355 | specified), and then finally with `text` (again, if specified |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 356 | and applicable). |
| 357 | |
| 358 | In the check-out codepath, the blob content is first converted |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 359 | with `text`, and then `ident` and fed to `filter`. |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 360 | |
| 361 | |
Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 362 | Merging branches with differing checkin/checkout attributes |
| 363 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 364 | |
| 365 | If you have added attributes to a file that cause the canonical |
| 366 | repository format for that file to change, such as adding a |
| 367 | clean/smudge filter or text/eol/ident attributes, merging anything |
| 368 | where the attribute is not in place would normally cause merge |
| 369 | conflicts. |
| 370 | |
| 371 | To prevent these unnecessary merge conflicts, git can be told to run a |
| 372 | virtual check-out and check-in of all three stages of a file when |
| 373 | resolving a three-way merge by setting the `merge.renormalize` |
| 374 | configuration variable. This prevents changes caused by check-in |
| 375 | conversion from causing spurious merge conflicts when a converted file |
| 376 | is merged with an unconverted file. |
| 377 | |
| 378 | As long as a "smudge->clean" results in the same output as a "clean" |
| 379 | even on files that are already smudged, this strategy will |
| 380 | automatically resolve all filter-related conflicts. Filters that do |
| 381 | not act in this way may cause additional merge conflicts that must be |
| 382 | resolved manually. |
| 383 | |
| 384 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 385 | Generating diff text |
| 386 | ~~~~~~~~~~~~~~~~~~~~ |
| 387 | |
Junio C Hamano | f7e47ee | 2008-11-02 18:16:45 | [diff] [blame] | 388 | `diff` |
| 389 | ^^^^^^ |
| 390 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 391 | The attribute `diff` affects how 'git' generates diffs for particular |
| 392 | files. It can tell git whether to generate a textual patch for the path |
| 393 | or to treat the path as a binary file. It can also affect what line is |
| 394 | shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an |
| 395 | external command to generate the diff, or ask git to convert binary |
| 396 | files to a text format before generating the diff. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 397 | |
| 398 | Set:: |
| 399 | |
| 400 | A path to which the `diff` attribute is set is treated |
| 401 | as text, even when they contain byte values that |
| 402 | normally never appear in text files, such as NUL. |
| 403 | |
| 404 | Unset:: |
| 405 | |
| 406 | A path to which the `diff` attribute is unset will |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 407 | generate `Binary files differ` (or a binary patch, if |
| 408 | binary patches are enabled). |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 409 | |
| 410 | Unspecified:: |
| 411 | |
| 412 | A path to which the `diff` attribute is unspecified |
| 413 | first gets its contents inspected, and if it looks like |
| 414 | text, it is treated as text. Otherwise it would |
| 415 | generate `Binary files differ`. |
| 416 | |
Junio C Hamano | 9db95ca | 2007-04-23 07:27:05 | [diff] [blame] | 417 | String:: |
| 418 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 419 | Diff is shown using the specified diff driver. Each driver may |
| 420 | specify one or more options, as described in the following |
| 421 | section. The options for the diff driver "foo" are defined |
| 422 | by the configuration variables in the "diff.foo" section of the |
| 423 | git config file. |
Junio C Hamano | 9db95ca | 2007-04-23 07:27:05 | [diff] [blame] | 424 | |
| 425 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 426 | Defining an external diff driver |
| 427 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
Junio C Hamano | 9db95ca | 2007-04-23 07:27:05 | [diff] [blame] | 428 | |
| 429 | The definition of a diff driver is done in `gitconfig`, not |
| 430 | `gitattributes` file, so strictly speaking this manual page is a |
| 431 | wrong place to talk about it. However... |
| 432 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 433 | To define an external diff driver `jcdiff`, add a section to your |
Junio C Hamano | 9db95ca | 2007-04-23 07:27:05 | [diff] [blame] | 434 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
| 435 | |
| 436 | ---------------------------------------------------------------- |
| 437 | [diff "jcdiff"] |
| 438 | command = j-c-diff |
| 439 | ---------------------------------------------------------------- |
| 440 | |
| 441 | When git needs to show you a diff for the path with `diff` |
| 442 | attribute set to `jcdiff`, it calls the command you specified |
| 443 | with the above configuration, i.e. `j-c-diff`, with 7 |
| 444 | parameters, just like `GIT_EXTERNAL_DIFF` program is called. |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 445 | See linkgit:git[1] for details. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 446 | |
| 447 | |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 448 | Defining a custom hunk-header |
| 449 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 450 | |
Junio C Hamano | 5e4d8de | 2008-09-19 06:27:02 | [diff] [blame] | 451 | Each group of changes (called a "hunk") in the textual diff output |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 452 | is prefixed with a line of the form: |
| 453 | |
| 454 | @@ -k,l +n,m @@ TEXT |
| 455 | |
Junio C Hamano | 5e4d8de | 2008-09-19 06:27:02 | [diff] [blame] | 456 | This is called a 'hunk header'. The "TEXT" portion is by default a line |
| 457 | that begins with an alphabet, an underscore or a dollar sign; this |
| 458 | matches what GNU 'diff -p' output uses. This default selection however |
| 459 | is not suited for some contents, and you can use a customized pattern |
| 460 | to make a selection. |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 461 | |
Junio C Hamano | 5e4d8de | 2008-09-19 06:27:02 | [diff] [blame] | 462 | First, in .gitattributes, you would assign the `diff` attribute |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 463 | for paths. |
| 464 | |
| 465 | ------------------------ |
| 466 | *.tex diff=tex |
| 467 | ------------------------ |
| 468 | |
Junio C Hamano | a476efa | 2008-10-10 15:31:42 | [diff] [blame] | 469 | Then, you would define a "diff.tex.xfuncname" configuration to |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 470 | specify a regular expression that matches a line that you would |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 471 | want to appear as the hunk header "TEXT". Add a section to your |
| 472 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 473 | |
| 474 | ------------------------ |
| 475 | [diff "tex"] |
Junio C Hamano | a476efa | 2008-10-10 15:31:42 | [diff] [blame] | 476 | xfuncname = "^(\\\\(sub)*section\\{.*)$" |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 477 | ------------------------ |
| 478 | |
| 479 | Note. A single level of backslashes are eaten by the |
| 480 | configuration file parser, so you would need to double the |
| 481 | backslashes; the pattern above picks a line that begins with a |
Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 482 | backslash, and zero or more occurrences of `sub` followed by |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 483 | `section` followed by open brace, to the end of line. |
| 484 | |
| 485 | There are a few built-in patterns to make this easier, and `tex` |
| 486 | is one of them, so you do not have to write the above in your |
| 487 | configuration file (you still need to enable this with the |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 488 | attribute mechanism, via `.gitattributes`). The following built in |
| 489 | patterns are available: |
| 490 | |
| 491 | - `bibtex` suitable for files with BibTeX coded references. |
| 492 | |
Junio C Hamano | 20d47e3 | 2009-01-26 06:36:02 | [diff] [blame] | 493 | - `cpp` suitable for source code in the C and C++ languages. |
| 494 | |
Junio C Hamano | 53ba6d0 | 2010-08-22 07:25:12 | [diff] [blame] | 495 | - `csharp` suitable for source code in the C# language. |
| 496 | |
Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 497 | - `fortran` suitable for source code in the Fortran language. |
| 498 | |
Junio C Hamano | f24b806 | 2008-09-09 01:34:39 | [diff] [blame] | 499 | - `html` suitable for HTML/XHTML documents. |
| 500 | |
Junio C Hamano | 675570c | 2008-09-13 06:07:28 | [diff] [blame] | 501 | - `java` suitable for source code in the Java language. |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 502 | |
Junio C Hamano | a476efa | 2008-10-10 15:31:42 | [diff] [blame] | 503 | - `objc` suitable for source code in the Objective-C language. |
| 504 | |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 505 | - `pascal` suitable for source code in the Pascal/Delphi language. |
| 506 | |
Junio C Hamano | 9b6fafe | 2011-01-14 00:43:22 | [diff] [blame] | 507 | - `perl` suitable for source code in the Perl language. |
| 508 | |
Junio C Hamano | f24b806 | 2008-09-09 01:34:39 | [diff] [blame] | 509 | - `php` suitable for source code in the PHP language. |
| 510 | |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 511 | - `python` suitable for source code in the Python language. |
| 512 | |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 513 | - `ruby` suitable for source code in the Ruby language. |
| 514 | |
| 515 | - `tex` suitable for source code for LaTeX documents. |
Junio C Hamano | 2a8f6dc | 2007-07-09 08:48:38 | [diff] [blame] | 516 | |
| 517 | |
Junio C Hamano | 20d47e3 | 2009-01-26 06:36:02 | [diff] [blame] | 518 | Customizing word diff |
| 519 | ^^^^^^^^^^^^^^^^^^^^^ |
| 520 | |
Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 521 | You can customize the rules that `git diff --word-diff` uses to |
Junio C Hamano | 20d47e3 | 2009-01-26 06:36:02 | [diff] [blame] | 522 | split words in a line, by specifying an appropriate regular expression |
| 523 | in the "diff.*.wordRegex" configuration variable. For example, in TeX |
| 524 | a backslash followed by a sequence of letters forms a command, but |
| 525 | several such commands can be run together without intervening |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 526 | whitespace. To separate them, use a regular expression in your |
| 527 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
Junio C Hamano | 20d47e3 | 2009-01-26 06:36:02 | [diff] [blame] | 528 | |
| 529 | ------------------------ |
| 530 | [diff "tex"] |
| 531 | wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" |
| 532 | ------------------------ |
| 533 | |
| 534 | A built-in pattern is provided for all languages listed in the |
| 535 | previous section. |
| 536 | |
| 537 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 538 | Performing text diffs of binary files |
| 539 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 540 | |
| 541 | Sometimes it is desirable to see the diff of a text-converted |
| 542 | version of some binary files. For example, a word processor |
| 543 | document can be converted to an ASCII text representation, and |
| 544 | the diff of the text shown. Even though this conversion loses |
| 545 | some information, the resulting diff is useful for human |
| 546 | viewing (but cannot be applied directly). |
| 547 | |
| 548 | The `textconv` config option is used to define a program for |
| 549 | performing such a conversion. The program should take a single |
| 550 | argument, the name of a file to convert, and produce the |
| 551 | resulting text on stdout. |
| 552 | |
| 553 | For example, to show the diff of the exif information of a |
| 554 | file instead of the binary information (assuming you have the |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 555 | exif tool installed), add the following section to your |
| 556 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file): |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 557 | |
| 558 | ------------------------ |
| 559 | [diff "jpg"] |
| 560 | textconv = exif |
| 561 | ------------------------ |
| 562 | |
| 563 | NOTE: The text conversion is generally a one-way conversion; |
| 564 | in this example, we lose the actual image contents and focus |
| 565 | just on the text data. This means that diffs generated by |
| 566 | textconv are _not_ suitable for applying. For this reason, |
| 567 | only `git diff` and the `git log` family of commands (i.e., |
| 568 | log, whatchanged, show) will perform text conversion. `git |
| 569 | format-patch` will never generate this output. If you want to |
| 570 | send somebody a text-converted diff of a binary file (e.g., |
| 571 | because it quickly conveys the changes you have made), you |
| 572 | should generate it separately and send it as a comment _in |
| 573 | addition to_ the usual binary diff that you might send. |
| 574 | |
Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 575 | Because text conversion can be slow, especially when doing a |
| 576 | large number of them with `git log -p`, git provides a mechanism |
| 577 | to cache the output and use it in future diffs. To enable |
| 578 | caching, set the "cachetextconv" variable in your diff driver's |
| 579 | config. For example: |
| 580 | |
| 581 | ------------------------ |
| 582 | [diff "jpg"] |
| 583 | textconv = exif |
| 584 | cachetextconv = true |
| 585 | ------------------------ |
| 586 | |
| 587 | This will cache the result of running "exif" on each blob |
| 588 | indefinitely. If you change the textconv config variable for a |
| 589 | diff driver, git will automatically invalidate the cache entries |
| 590 | and re-run the textconv filter. If you want to invalidate the |
| 591 | cache manually (e.g., because your version of "exif" was updated |
| 592 | and now produces better output), you can remove the cache |
| 593 | manually with `git update-ref -d refs/notes/textconv/jpg` (where |
| 594 | "jpg" is the name of the diff driver, as in the example above). |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 595 | |
Junio C Hamano | f93530e | 2011-05-25 23:59:59 | [diff] [blame^] | 596 | Choosing textconv versus external diff |
| 597 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 598 | |
| 599 | If you want to show differences between binary or specially-formatted |
| 600 | blobs in your repository, you can choose to use either an external diff |
| 601 | command, or to use textconv to convert them to a diff-able text format. |
| 602 | Which method you choose depends on your exact situation. |
| 603 | |
| 604 | The advantage of using an external diff command is flexibility. You are |
| 605 | not bound to find line-oriented changes, nor is it necessary for the |
| 606 | output to resemble unified diff. You are free to locate and report |
| 607 | changes in the most appropriate way for your data format. |
| 608 | |
| 609 | A textconv, by comparison, is much more limiting. You provide a |
| 610 | transformation of the data into a line-oriented text format, and git |
| 611 | uses its regular diff tools to generate the output. There are several |
| 612 | advantages to choosing this method: |
| 613 | |
| 614 | 1. Ease of use. It is often much simpler to write a binary to text |
| 615 | transformation than it is to perform your own diff. In many cases, |
| 616 | existing programs can be used as textconv filters (e.g., exif, |
| 617 | odt2txt). |
| 618 | |
| 619 | 2. Git diff features. By performing only the transformation step |
| 620 | yourself, you can still utilize many of git's diff features, |
| 621 | including colorization, word-diff, and combined diffs for merges. |
| 622 | |
| 623 | 3. Caching. Textconv caching can speed up repeated diffs, such as those |
| 624 | you might trigger by running `git log -p`. |
| 625 | |
| 626 | |
Junio C Hamano | 9b6fafe | 2011-01-14 00:43:22 | [diff] [blame] | 627 | Marking files as binary |
| 628 | ^^^^^^^^^^^^^^^^^^^^^^^ |
| 629 | |
| 630 | Git usually guesses correctly whether a blob contains text or binary |
| 631 | data by examining the beginning of the contents. However, sometimes you |
| 632 | may want to override its decision, either because a blob contains binary |
| 633 | data later in the file, or because the content, while technically |
| 634 | composed of text characters, is opaque to a human reader. For example, |
| 635 | many postscript files contain only ascii characters, but produce noisy |
| 636 | and meaningless diffs. |
| 637 | |
| 638 | The simplest way to mark a file as binary is to unset the diff |
| 639 | attribute in the `.gitattributes` file: |
| 640 | |
| 641 | ------------------------ |
| 642 | *.ps -diff |
| 643 | ------------------------ |
| 644 | |
| 645 | This will cause git to generate `Binary files differ` (or a binary |
| 646 | patch, if binary patches are enabled) instead of a regular diff. |
| 647 | |
| 648 | However, one may also want to specify other diff driver attributes. For |
| 649 | example, you might want to use `textconv` to convert postscript files to |
| 650 | an ascii representation for human viewing, but otherwise treat them as |
| 651 | binary files. You cannot specify both `-diff` and `diff=ps` attributes. |
| 652 | The solution is to use the `diff.*.binary` config option: |
| 653 | |
| 654 | ------------------------ |
| 655 | [diff "ps"] |
| 656 | textconv = ps2ascii |
| 657 | binary = true |
| 658 | ------------------------ |
| 659 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 660 | Performing a three-way merge |
| 661 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 662 | |
Junio C Hamano | f7e47ee | 2008-11-02 18:16:45 | [diff] [blame] | 663 | `merge` |
| 664 | ^^^^^^^ |
| 665 | |
Junio C Hamano | fa28cb1 | 2011-03-19 01:35:35 | [diff] [blame] | 666 | The attribute `merge` affects how three versions of a file are |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 667 | merged when a file-level merge is necessary during `git merge`, |
Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 668 | and other commands such as `git revert` and `git cherry-pick`. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 669 | |
| 670 | Set:: |
| 671 | |
| 672 | Built-in 3-way merge driver is used to merge the |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 673 | contents in a way similar to 'merge' command of `RCS` |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 674 | suite. This is suitable for ordinary text files. |
| 675 | |
| 676 | Unset:: |
| 677 | |
| 678 | Take the version from the current branch as the |
| 679 | tentative merge result, and declare that the merge has |
Junio C Hamano | fa28cb1 | 2011-03-19 01:35:35 | [diff] [blame] | 680 | conflicts. This is suitable for binary files that do |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 681 | not have a well-defined merge semantics. |
| 682 | |
| 683 | Unspecified:: |
| 684 | |
| 685 | By default, this uses the same built-in 3-way merge |
Junio C Hamano | fa28cb1 | 2011-03-19 01:35:35 | [diff] [blame] | 686 | driver as is the case when the `merge` attribute is set. |
| 687 | However, the `merge.default` configuration variable can name |
| 688 | different merge driver to be used with paths for which the |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 689 | `merge` attribute is unspecified. |
| 690 | |
Junio C Hamano | 9db95ca | 2007-04-23 07:27:05 | [diff] [blame] | 691 | String:: |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 692 | |
| 693 | 3-way merge is performed using the specified custom |
| 694 | merge driver. The built-in 3-way merge driver can be |
| 695 | explicitly specified by asking for "text" driver; the |
| 696 | built-in "take the current branch" driver can be |
Junio C Hamano | 22572e7 | 2007-04-25 05:59:25 | [diff] [blame] | 697 | requested with "binary". |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 698 | |
| 699 | |
Junio C Hamano | f556fc2 | 2007-12-23 08:16:38 | [diff] [blame] | 700 | Built-in merge drivers |
| 701 | ^^^^^^^^^^^^^^^^^^^^^^ |
| 702 | |
| 703 | There are a few built-in low-level merge drivers defined that |
| 704 | can be asked for via the `merge` attribute. |
| 705 | |
| 706 | text:: |
| 707 | |
| 708 | Usual 3-way file level merge for text files. Conflicted |
| 709 | regions are marked with conflict markers `<<<<<<<`, |
| 710 | `=======` and `>>>>>>>`. The version from your branch |
| 711 | appears before the `=======` marker, and the version |
| 712 | from the merged branch appears after the `=======` |
| 713 | marker. |
| 714 | |
| 715 | binary:: |
| 716 | |
| 717 | Keep the version from your branch in the work tree, but |
| 718 | leave the path in the conflicted state for the user to |
| 719 | sort out. |
| 720 | |
| 721 | union:: |
| 722 | |
| 723 | Run 3-way file level merge for text files, but take |
| 724 | lines from both versions, instead of leaving conflict |
| 725 | markers. This tends to leave the added lines in the |
| 726 | resulting file in random order and the user should |
| 727 | verify the result. Do not use this if you do not |
| 728 | understand the implications. |
| 729 | |
| 730 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 731 | Defining a custom merge driver |
| 732 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 733 | |
Junio C Hamano | f556fc2 | 2007-12-23 08:16:38 | [diff] [blame] | 734 | The definition of a merge driver is done in the `.git/config` |
| 735 | file, not in the `gitattributes` file, so strictly speaking this |
| 736 | manual page is a wrong place to talk about it. However... |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 737 | |
| 738 | To define a custom merge driver `filfre`, add a section to your |
| 739 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
| 740 | |
| 741 | ---------------------------------------------------------------- |
| 742 | [merge "filfre"] |
| 743 | name = feel-free merge driver |
| 744 | driver = filfre %O %A %B |
| 745 | recursive = binary |
| 746 | ---------------------------------------------------------------- |
| 747 | |
| 748 | The `merge.*.name` variable gives the driver a human-readable |
| 749 | name. |
| 750 | |
| 751 | The `merge.*.driver` variable's value is used to construct a |
| 752 | command to run to merge ancestor's version (`%O`), current |
| 753 | version (`%A`) and the other branches' version (`%B`). These |
| 754 | three tokens are replaced with the names of temporary files that |
| 755 | hold the contents of these versions when the command line is |
Junio C Hamano | 86660db | 2010-02-24 01:12:54 | [diff] [blame] | 756 | built. Additionally, %L will be replaced with the conflict marker |
| 757 | size (see below). |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 758 | |
| 759 | The merge driver is expected to leave the result of the merge in |
| 760 | the file named with `%A` by overwriting it, and exit with zero |
| 761 | status if it managed to merge them cleanly, or non-zero if there |
| 762 | were conflicts. |
| 763 | |
| 764 | The `merge.*.recursive` variable specifies what other merge |
| 765 | driver to use when the merge driver is called for an internal |
| 766 | merge between common ancestors, when there are more than one. |
| 767 | When left unspecified, the driver itself is used for both |
| 768 | internal merge and the final merge. |
| 769 | |
| 770 | |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 771 | `conflict-marker-size` |
| 772 | ^^^^^^^^^^^^^^^^^^^^^^ |
| 773 | |
| 774 | This attribute controls the length of conflict markers left in |
| 775 | the work tree file during a conflicted merge. Only setting to |
| 776 | the value to a positive integer has any meaningful effect. |
| 777 | |
| 778 | For example, this line in `.gitattributes` can be used to tell the merge |
| 779 | machinery to leave much longer (instead of the usual 7-character-long) |
| 780 | conflict markers when merging the file `Documentation/git-merge.txt` |
| 781 | results in a conflict. |
| 782 | |
| 783 | ------------------------ |
| 784 | Documentation/git-merge.txt conflict-marker-size=32 |
| 785 | ------------------------ |
| 786 | |
| 787 | |
Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 788 | Checking whitespace errors |
| 789 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 790 | |
| 791 | `whitespace` |
| 792 | ^^^^^^^^^^^^ |
| 793 | |
| 794 | The `core.whitespace` configuration variable allows you to define what |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 795 | 'diff' and 'apply' should consider whitespace errors for all paths in |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 796 | the project (See linkgit:git-config[1]). This attribute gives you finer |
Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 797 | control per path. |
| 798 | |
| 799 | Set:: |
| 800 | |
| 801 | Notice all types of potential whitespace errors known to git. |
Junio C Hamano | eef01fe | 2010-12-13 08:31:58 | [diff] [blame] | 802 | The tab width is taken from the value of the `core.whitespace` |
| 803 | configuration variable. |
Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 804 | |
| 805 | Unset:: |
| 806 | |
| 807 | Do not notice anything as error. |
| 808 | |
| 809 | Unspecified:: |
| 810 | |
Junio C Hamano | eef01fe | 2010-12-13 08:31:58 | [diff] [blame] | 811 | Use the value of the `core.whitespace` configuration variable to |
Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 812 | decide what to notice as error. |
| 813 | |
| 814 | String:: |
| 815 | |
| 816 | Specify a comma separate list of common whitespace problems to |
Junio C Hamano | eef01fe | 2010-12-13 08:31:58 | [diff] [blame] | 817 | notice in the same format as the `core.whitespace` configuration |
Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 818 | variable. |
| 819 | |
| 820 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 821 | Creating an archive |
| 822 | ~~~~~~~~~~~~~~~~~~~ |
| 823 | |
| 824 | `export-ignore` |
| 825 | ^^^^^^^^^^^^^^^ |
| 826 | |
| 827 | Files and directories with the attribute `export-ignore` won't be added to |
| 828 | archive files. |
| 829 | |
| 830 | `export-subst` |
| 831 | ^^^^^^^^^^^^^^ |
| 832 | |
| 833 | If the attribute `export-subst` is set for a file then git will expand |
| 834 | several placeholders when adding this file to an archive. The |
| 835 | expansion depends on the availability of a commit ID, i.e., if |
| 836 | linkgit:git-archive[1] has been given a tree instead of a commit or a |
| 837 | tag then no replacement will be done. The placeholders are the same |
| 838 | as those for the option `--pretty=format:` of linkgit:git-log[1], |
| 839 | except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` |
| 840 | in the file. E.g. the string `$Format:%H$` will be replaced by the |
| 841 | commit hash. |
| 842 | |
| 843 | |
Junio C Hamano | a10d8d2 | 2009-10-22 03:09:05 | [diff] [blame] | 844 | Packing objects |
| 845 | ~~~~~~~~~~~~~~~ |
| 846 | |
| 847 | `delta` |
| 848 | ^^^^^^^ |
| 849 | |
| 850 | Delta compression will not be attempted for blobs for paths with the |
| 851 | attribute `delta` set to false. |
| 852 | |
| 853 | |
Junio C Hamano | d3452a0 | 2008-11-15 08:07:55 | [diff] [blame] | 854 | Viewing files in GUI tools |
| 855 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 856 | |
| 857 | `encoding` |
| 858 | ^^^^^^^^^^ |
| 859 | |
| 860 | The value of this attribute specifies the character encoding that should |
| 861 | be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to |
| 862 | display the contents of the relevant file. Note that due to performance |
| 863 | considerations linkgit:gitk[1] does not use this attribute unless you |
| 864 | manually enable per-file encodings in its options. |
| 865 | |
| 866 | If this attribute is not set or has an invalid value, the value of the |
| 867 | `gui.encoding` configuration variable is used instead |
| 868 | (See linkgit:git-config[1]). |
| 869 | |
| 870 | |
Junio C Hamano | fcb740a | 2008-08-31 06:32:05 | [diff] [blame] | 871 | USING ATTRIBUTE MACROS |
| 872 | ---------------------- |
| 873 | |
| 874 | You do not want any end-of-line conversions applied to, nor textual diffs |
| 875 | produced for, any binary file you track. You would need to specify e.g. |
| 876 | |
| 877 | ------------ |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 878 | *.jpg -text -diff |
Junio C Hamano | fcb740a | 2008-08-31 06:32:05 | [diff] [blame] | 879 | ------------ |
| 880 | |
| 881 | but that may become cumbersome, when you have many attributes. Using |
| 882 | attribute macros, you can specify groups of attributes set or unset at |
| 883 | the same time. The system knows a built-in attribute macro, `binary`: |
| 884 | |
| 885 | ------------ |
| 886 | *.jpg binary |
| 887 | ------------ |
| 888 | |
| 889 | which is equivalent to the above. Note that the attribute macros can only |
| 890 | be "Set" (see the above example that sets "binary" macro as if it were an |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 891 | ordinary attribute --- setting it in turn unsets "text" and "diff"). |
Junio C Hamano | fcb740a | 2008-08-31 06:32:05 | [diff] [blame] | 892 | |
| 893 | |
| 894 | DEFINING ATTRIBUTE MACROS |
| 895 | ------------------------- |
| 896 | |
| 897 | Custom attribute macros can be defined only in the `.gitattributes` file |
| 898 | at the toplevel (i.e. not in any subdirectory). The built-in attribute |
| 899 | macro "binary" is equivalent to: |
| 900 | |
| 901 | ------------ |
Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 902 | [attr]binary -diff -text |
Junio C Hamano | fcb740a | 2008-08-31 06:32:05 | [diff] [blame] | 903 | ------------ |
| 904 | |
| 905 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 906 | EXAMPLE |
| 907 | ------- |
| 908 | |
| 909 | If you have these three `gitattributes` file: |
| 910 | |
| 911 | ---------------------------------------------------------------- |
| 912 | (in $GIT_DIR/info/attributes) |
| 913 | |
| 914 | a* foo !bar -baz |
| 915 | |
| 916 | (in .gitattributes) |
| 917 | abc foo bar baz |
| 918 | |
| 919 | (in t/.gitattributes) |
| 920 | ab* merge=filfre |
| 921 | abc -foo -bar |
| 922 | *.c frotz |
| 923 | ---------------------------------------------------------------- |
| 924 | |
| 925 | the attributes given to path `t/abc` are computed as follows: |
| 926 | |
| 927 | 1. By examining `t/.gitattributes` (which is in the same |
Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 928 | directory as the path in question), git finds that the first |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 929 | line matches. `merge` attribute is set. It also finds that |
| 930 | the second line matches, and attributes `foo` and `bar` |
| 931 | are unset. |
| 932 | |
| 933 | 2. Then it examines `.gitattributes` (which is in the parent |
| 934 | directory), and finds that the first line matches, but |
| 935 | `t/.gitattributes` file already decided how `merge`, `foo` |
| 936 | and `bar` attributes should be given to this path, so it |
| 937 | leaves `foo` and `bar` unset. Attribute `baz` is set. |
| 938 | |
Junio C Hamano | bdeff82 | 2007-07-30 09:07:17 | [diff] [blame] | 939 | 3. Finally it examines `$GIT_DIR/info/attributes`. This file |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 940 | is used to override the in-tree settings. The first line is |
| 941 | a match, and `foo` is set, `bar` is reverted to unspecified |
| 942 | state, and `baz` is unset. |
| 943 | |
Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 944 | As the result, the attributes assignment to `t/abc` becomes: |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 945 | |
| 946 | ---------------------------------------------------------------- |
| 947 | foo set to true |
| 948 | bar unspecified |
| 949 | baz set to false |
| 950 | merge set to string value "filfre" |
| 951 | frotz unspecified |
| 952 | ---------------------------------------------------------------- |
| 953 | |
| 954 | |
Junio C Hamano | ef4c2d1 | 2007-09-10 08:11:27 | [diff] [blame] | 955 | |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 956 | GIT |
| 957 | --- |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 958 | Part of the linkgit:git[1] suite |