Information Technology Reference
In-Depth Information
Attribute
Description
Turns off three attributes:
diff, merge, text
binary
conflict-
marker-
size
Defines the length of conflicts markers.
Delta compression will not be attempted for blobs that are generated by paths with
the attribute delta set to
false
.
delta
This attribute affects the way git performs the
$ git diff
operation for a given
file.
diff
The value of this attribute specifies the character encoding that should be used by
GUI tools (e.g., gitk and git-gui) to display the contents of the relevant file.
encoding
eol
The attribute defines a line ending to be used during checkout.
export-
ignore
Excludes files from archives generated with the
$ git archive
command.
export-
subst
Substitutes files with some other files during the
$ git archive
command.
This attribute can be used to perform additional processing during checkout and
check-in.
filter
This attribute allows embedding of
$Id$
variables in files. These variables are pro-
cessed during check-in and checkout.
ident
Defines whether the file can be merged as text files with markers
<<<<<<<,
=======, >>>>>>>
or if it should be treated as a binary file.
merge
This attribute governs the end-of-line normalization.
text
white-
space
This attribute allows you to tailor the control of white space errors.
The full description of all the attributes can be obtained with the
$ git attrib-
utes --help
command.
Summary
This chapter is a final and necessary step before collaborating with other developers. It
gives you accurate answers to following questions: