Setup and Config
Getting and Creating Projects
Basic Snapshotting
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
Patching
Debugging
External Systems
Server Admin
Guides
- gitattributes
- Command-line interface conventions
- Everyday Git
- Frequently Asked Questions (FAQ)
- Glossary
- Hooks
- gitignore
- gitmodules
- Revisions
- Submodules
- Tutorial
- Workflows
- All guides...
Administration
Plumbing Commands
-
2.56.0
2026-09-28
-
2.55.0
2026-06-29
- 2.50.1 → 2.54.0 no changes
-
2.50.0
2025-06-16
- 2.49.1 no changes
-
2.49.0
2025-03-14
- 2.46.1 → 2.48.2 no changes
-
2.46.0
2024-07-29
- 2.44.1 → 2.45.4 no changes
-
2.44.0
2024-02-23
- 2.43.1 → 2.43.7 no changes
-
2.43.0
2023-11-20
- 2.42.1 → 2.42.4 no changes
-
2.42.0
2023-08-21
- 2.41.1 → 2.41.3 no changes
-
2.41.0
2023-06-01
- 2.40.1 → 2.40.4 no changes
-
2.40.0
2023-03-12
- 2.36.1 → 2.39.5 no changes
-
2.36.0
2022-04-18
- 2.32.1 → 2.35.8 no changes
-
2.32.0
2021-06-06
- 2.30.1 → 2.31.8 no changes
-
2.30.0
2020-12-27
- 2.27.1 → 2.29.3 no changes
-
2.27.0
2020-06-01
- 2.25.1 → 2.26.3 no changes
-
2.25.0
2020-01-13
- 2.24.1 → 2.24.4 no changes
-
2.24.0
2019-11-04
- 2.23.1 → 2.23.4 no changes
-
2.23.0
2019-08-16
- 2.22.1 → 2.22.5 no changes
-
2.22.0
2019-06-07
- 2.21.1 → 2.21.4 no changes
-
2.21.0
2019-02-24
- 2.19.3 → 2.20.5 no changes
-
2.19.2
2018-11-21
- 2.18.1 → 2.19.1 no changes
-
2.18.0
2018-06-21
- 2.17.1 → 2.17.6 no changes
-
2.17.0
2018-04-02
-
2.16.6
2019-12-06
- 2.15.4 no changes
-
2.14.6
2019-12-06
-
2.13.7
2018-05-22
- 2.12.5 no changes
-
2.11.4
2017-09-22
-
2.10.5
2017-09-22
-
2.9.5
2017-07-30
- 2.7.6 → 2.8.6 no changes
-
2.6.7
2017-05-05
-
2.5.6
2017-05-05
-
2.4.12
2017-05-05
- 2.3.10 no changes
-
2.2.3
2015-09-04
- 2.1.4 no changes
-
2.0.5
2014-12-17
DESCRIPTION
A gitattributes file is a simple text file that gives
attributes to pathnames.
Each line in gitattributes file is of form:
pattern attr1 attr2 ...
That is, a pattern followed by an attributes list, separated by whitespaces. Leading and trailing whitespaces are ignored. Lines that begin with # are ignored. Patterns that begin with a double quote are quoted in C style. When the pattern matches the path in question, the attributes listed on the line are given to the path.
Each attribute can be in one of these states for a given path:
- Set
-
The path has the attribute with special value "true"; this is specified by listing only the name of the attribute in the attribute list.
- Unset
-
The path has the attribute with special value "false"; this is specified by listing the name of the attribute prefixed with a dash
-in the attribute list. - Set to a value
-
The path has the attribute with specified string value; this is specified by listing the name of the attribute followed by an equal sign
=and its value in the attribute list. - Unspecified
-
No pattern matches the path, and nothing says if the path has or does not have the attribute, the attribute for the path is said to be Unspecified.
When more than one pattern matches the path, a later line overrides an earlier line. This overriding is done per attribute.
The rules by which the pattern matches paths are the same as in
.gitignore files (see gitignore[5]), with a few exceptions:
-
negative patterns are forbidden
-
patterns that match a directory do not recursively match paths inside that directory (so using the trailing-slash
path/syntax is pointless in an attributes file; usepath/**instead)
When deciding what attributes are assigned to a path, Git
consults $GIT_DIR/info/attributes file (which has the highest
precedence), .gitattributes file in the same directory as the
path in question, and its parent directories up to the toplevel of the
work tree (the further the directory that contains .gitattributes
is from the path in question, the lower its precedence). Finally
global and system-wide files are considered (they have the lowest
precedence).
When the .gitattributes file is missing from the work tree, the
path in the index is used as a fall-back. During checkout process,
.gitattributes in the index is used and then the file in the
working tree is used as a fall-back.
If you wish to affect only a single repository (i.e., to assign
attributes to files that are particular to
one user’s workflow for that repository), then
attributes should be placed in the $GIT_DIR/info/attributes file.
Attributes which should be version-controlled and distributed to other
repositories (i.e., attributes of interest to all users) should go into
.gitattributes files. Attributes that should affect all repositories
for a single user should be placed in a file specified by the
core.attributesFile configuration option (see git-config[1]).
Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
is either not set or empty, $HOME/.config/git/attributes is used instead.
Attributes for all users on a system should be placed in the
$(prefix)/etc/gitattributes file.
Sometimes you would need to override a setting of an attribute
for a path to Unspecified state. This can be done by listing
the name of the attribute prefixed with an exclamation point !.
RESERVED BUILTIN_* ATTRIBUTES
builtin_* is a reserved namespace for builtin attribute values. Any user defined attributes under this namespace will be ignored and trigger a warning.
builtin_objectmode
This attribute is for filtering files by their file bit modes (40000,
120000, 160000, 100755, 100644). e.g. :(attr:builtin_objectmode=160000).
You may also check these values with git check-attr builtin_objectmode -- <file>.
If the object is not in the index git check-attr --cached will return unspecified.
EFFECTS
Certain operations by Git can be influenced by assigning particular attributes to a path. Currently, the following operations are attributes-aware.
Checking-out and checking-in
These attributes affect how the contents stored in the repository are copied to the working tree files when commands such as git switch, git checkout and git merge run. They also affect how Git stores the contents you prepare in the working tree in the repository upon git add and git commit.
text
This attribute marks the path as a text file, which enables end-of-line
conversion: When a matching file is added to the index, the file’s line
endings are normalized to LF in the index. Conversely, when the file is
copied from the index to the working directory, its line endings may be
converted from LF to CRLF depending on the eol attribute, the Git
config, and the platform (see explanation of eol below).
- Set
-
Setting the
textattribute on a path enables end-of-line conversion on checkin and checkout as described above. Line endings are normalized to LF in the index every time the file is checked in, even if the file was previously added to Git with CRLF line endings. - Unset
-
Unsetting the
textattribute on a path tells Git not to attempt any end-of-line conversion upon checkin or checkout. - Set to string value "auto"
-
When
textis set to "auto", Git decides by itself whether the file is text or binary. If it is text and the file was not already in Git with CRLF endings, line endings are converted on checkin and checkout as described above. Otherwise, no conversion is done on checkin or checkout. - Unspecified
-
If the
textattribute is unspecified, Git uses thecore.autocrlfconfiguration variable to determine if the file should be converted.
Any other value causes Git to act as if text has been left
unspecified.
eol
This attribute marks a path to use a specific line-ending style in the
working tree when it is checked out. It has effect only if text or
text=auto is set (see above), but specifying eol automatically sets
text if text was left unspecified.
- Set to string value "crlf"
-
This setting converts the file’s line endings in the working directory to CRLF when the file is checked out.
- Set to string value "lf"
-
This setting uses the same line endings in the working directory as in the index when the file is checked out.
- Unspecified
-
If the
eolattribute is unspecified for a file, its line endings in the working directory are determined by thecore.autocrlforcore.eolconfiguration variable (see the definitions of those options in git-config[1]). Iftextis set but neither of those variables is, the default iseol=crlfon Windows andeol=lfon all other platforms.
Backwards compatibility with crlf attribute
For backwards compatibility, the crlf attribute is interpreted as
follows:
crlf text -crlf -text crlf=input eol=lf
End-of-line conversion
While Git normally leaves file contents alone, it can be configured to normalize line endings to LF in the repository and, optionally, to convert them to CRLF when files are checked out.
If you simply want to have CRLF line endings in your working directory regardless of the repository you are working with, you can set the config variable "core.autocrlf" without using any attributes.
[core] autocrlf = true
This does not force normalization of text files, but does ensure that text files that you introduce to the repository have their line endings normalized to LF when they are added, and that files that are already normalized in the repository stay normalized.
If you want to ensure that text files that any contributor introduces to
the repository have their line endings normalized, you can set the
text attribute to "auto" for all files.
* text=auto
The attributes allow a fine-grained control, how the line endings are converted. Here is an example that will make Git normalize .txt, .vcproj and .sh files, ensure that .vcproj files have CRLF and .sh files have LF in the working directory, and prevent .jpg files from being normalized regardless of their content.
* text=auto *.txt text *.vcproj text eol=crlf *.sh text eol=lf *.jpg -text
|
Note
|
When text=auto conversion is enabled in a cross-platform
project using push and pull to a central repository the text files
containing CRLFs should be normalized.
|
From a clean working directory:
$ echo "* text=auto" >.gitattributes $ git add --renormalize . $ git status # Show files that will be normalized $ git commit -m "Introduce end-of-line normalization"
If any files that should not be normalized show up in git status,
unset their text attribute before running git add -u.
manual.pdf -text
Conversely, text files that Git does not detect can have normalization enabled manually.
weirdchars.txt text
If core.safecrlf is set to "true" or "warn", Git verifies if
the conversion is reversible for the current setting of
core.autocrlf. For "true", Git rejects irreversible
conversions; for "warn", Git only prints a warning but accepts
an irreversible conversion. The safety triggers to prevent such
a conversion done to the files in the work tree, but there are a
few exceptions. Even though…
-
git add itself does not touch the files in the work tree, the next checkout would, so the safety triggers;
-
git apply to update a text file with a patch does touch the files in the work tree, but the operation is about text files and CRLF conversion is about fixing the line ending inconsistencies, so the safety does not trigger;
-
git diff itself does not touch the files in the work tree, it is often run to inspect the changes you intend to next git add. To catch potential problems early, safety triggers.
working-tree-encoding
Git recognizes files encoded in ASCII or one of its supersets (e.g. UTF-8, ISO-8859-1, …) as text files. Files encoded in certain other encodings (e.g. UTF-16) are interpreted as binary and consequently built-in Git text processing tools (e.g. git diff) as well as most Git web front ends do not visualize the contents of these files by default.
In these cases you can tell Git the encoding of a file in the working
directory with the working-tree-encoding attribute. If a file with this
attribute is added to Git, then Git re-encodes the content from the
specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
content in its internal data structure (called "the index"). On checkout
the content is re-encoded back to the specified encoding.
Please note that using the working-tree-encoding attribute may have a
number of pitfalls:
-
Alternative Git implementations (e.g. JGit or libgit2) and older Git versions (as of March 2018) do not support the
working-tree-encodingattribute. If you decide to use theworking-tree-encodingattribute in your repository, then it is strongly recommended to ensure that all clients working with the repository support it.For example, Microsoft Visual Studio resources files (
*.rc) or PowerShell script files (*.ps1) are sometimes encoded in UTF-16. If you declare*.ps1as files as UTF-16 and you addfoo.ps1with aworking-tree-encodingenabled Git client, thenfoo.ps1will be stored as UTF-8 internally. A client withoutworking-tree-encodingsupport will checkoutfoo.ps1as UTF-8 encoded file. This will typically cause trouble for the users of this file.If a Git client that does not support the
working-tree-encodingattribute adds a new filebar.ps1, thenbar.ps1will be stored "as-is" internally (in this example probably as UTF-16). A client withworking-tree-encodingsupport will interpret the internal contents as UTF-8 and try to convert it to UTF-16 on checkout. That operation will fail and cause an error. -
Reencoding content to non-UTF encodings can cause errors as the conversion might not be UTF-8 round trip safe. If you suspect your encoding to not be round trip safe, then add it to
core.checkRoundtripEncodingto make Git check the round trip encoding (see git-config[1]). SHIFT-JIS (Japanese character set) is known to have round trip issues with UTF-8 and is checked by default. -
Reencoding content requires resources that might slow down certain Git operations (e.g git checkout or git add).
Use the working-tree-encoding attribute only if you cannot store a file
in UTF-8 encoding and if you want Git to be able to process the content
as text.
As an example, use the following attributes if your *.ps1 files are UTF-16 encoded with byte order mark (BOM) and you want Git to perform automatic line ending conversion based on your platform.
*.ps1 text working-tree-encoding=UTF-16
Use the following attributes if your *.ps1 files are UTF-16 little
endian encoded without BOM and you want Git to use Windows line endings
in the working directory (use UTF-16LE-BOM instead of UTF-16LE if
you want UTF-16 little endian with BOM).
Please note, it is highly recommended to
explicitly define the line endings with eol if the working-tree-encoding
attribute is used to avoid ambiguity.
*.ps1 text working-tree-encoding=UTF-16LE eol=crlf
You can get a list of all available encodings on your platform with the following command:
iconv --list
If you do not know the encoding of a file, then you can use the file
command to guess the encoding:
file foo.ps1
ident
When the attribute ident is set for a path, Git replaces
$Id$ in the blob object with $Id:, followed by the
40-character hexadecimal blob object name, followed by a dollar
sign $ upon checkout. Any byte sequence that begins with
$Id: and ends with $ in the worktree file is replaced
with $Id$ upon check-in.
filter
A filter attribute can be set to a string value that names a
filter driver specified in the configuration.
A filter driver consists of a clean command and a smudge
command, either of which can be left unspecified. Upon
checkout, when the smudge command is specified, the command is
fed the blob object from its standard input, and its standard
output is used to update the worktree file. Similarly, the
clean command is used to convert the contents of worktree file
upon checkin. By default these commands process only a single
blob and terminate. If a long running process filter is used
in place of clean and/or smudge filters, then Git can process
all blobs with a single filter command invocation for the entire
life of a single Git command, for example git add --all. If a
long running process filter is configured then it always takes
precedence over a configured single blob filter. See section
below for the description of the protocol used to communicate with
a process filter.
One use of the content filtering is to massage the content into a shape that is more convenient for the platform, filesystem, and the user to use. For this mode of operation, the key phrase here is "more convenient" and not "turning something unusable into usable". In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project should still be usable.
Another use of the content filtering is to store the content that cannot be directly used in the repository (e.g. a UUID that refers to the true content stored outside Git, or an encrypted content) and turn it into a usable form upon checkout (e.g. download the external content, or decrypt the encrypted content).
These two filters behave differently, and by default, a filter is taken as the former, massaging the contents into more convenient shape. A missing filter driver definition in the config, or a filter driver that exits with a non-zero status, is not an error but makes the filter a no-op passthru.
You can declare that a filter turns a content that by itself is unusable
into a usable content by setting the filter.<driver>.required configuration
variable to true.
Note: Whenever the clean filter is changed, the repo should be renormalized: $ git add --renormalize .
For example, in .gitattributes, you would assign the filter
attribute for paths.
*.c filter=indent
Then you would define a "filter.indent.clean" and "filter.indent.smudge" configuration in your .git/config to specify a pair of commands to modify the contents of C programs when the source files are checked in ("clean" is run) and checked out (no change is made because the command is "cat").
[filter "indent"] clean = indent smudge = cat
For best results, clean should not alter its output further if it is
run twice ("clean→clean" should be equivalent to "clean"), and
multiple smudge commands should not alter clean's output
("smudge→smudge→clean" should be equivalent to "clean"). See the
section on merging below.
The "indent" filter is well-behaved in this regard: it will not modify input that is already correctly indented. In this case, the lack of a smudge filter means that the clean filter must accept its own output without modifying it.
If a filter must succeed in order to make the stored contents usable,
you can declare that the filter is required, in the configuration:
[filter "crypt"] clean = openssl enc ... smudge = openssl enc -d ... required
Sequence "%f" on the filter command line is replaced with the name of the file the filter is working on. A filter might use this in keyword substitution. For example:
[filter "p4"] clean = git-p4-filter --clean %f smudge = git-p4-filter --smudge %f
Note that "%f" is the name of the path that is being worked on. Depending on the version that is being filtered, the corresponding file on disk may not exist, or may have different contents. So, smudge and clean commands should not try to access the file on disk, but only act as filters on the content provided to them on standard input.
Long Running Filter Process
If the filter command (a string value) is defined via
filter.<driver>.process then Git can process all blobs with a
single filter invocation for the entire life of a single Git
command. This is achieved by using the long-running process protocol
(described in Documentation/technical/long-running-process-protocol.adoc).
When Git encounters the first file that needs to be cleaned or smudged, it starts the filter and performs the handshake. In the handshake, the welcome message sent by Git is "git-filter-client", only version 2 is supported, and the supported capabilities are "clean", "smudge", and "delay".
Afterwards Git sends a list of "key=value" pairs terminated with a flush packet. The list will contain at least the filter command (based on the supported capabilities) and the pathname of the file to filter relative to the repository root. Right after the flush packet Git sends the content split in zero or more pkt-line packets and a flush packet to terminate content. Please note, that the filter must not send any response before it received the content and the final flush packet. Also note that the "value" of a "key=value" pair can contain the "=" character whereas the key would never contain that character.
packet: git> command=smudge packet: git> pathname=path/testfile.dat packet: git> 0000 packet: git> CONTENT packet: git> 0000
The filter is expected to respond with a list of "key=value" pairs terminated with a flush packet. If the filter does not experience problems then the list must contain a "success" status. Right after these packets the filter is expected to send the content in zero or more pkt-line packets and a flush packet at the end. Finally, a second list of "key=value" pairs terminated with a flush packet is expected. The filter can change the status in the second list or keep the status as is with an empty list. Please note that the empty list must be terminated with a flush packet regardless.
packet: git< status=success packet: git< 0000 packet: git< SMUDGED_CONTENT packet: git< 0000 packet: git< 0000 # empty list, keep "status=success" unchanged!
If the result content is empty then the filter is expected to respond with a "success" status and a flush packet to signal the empty content.
packet: git< status=success packet: git< 0000 packet: git< 0000 # empty content! packet: git< 0000 # empty list, keep "status=success" unchanged!
In case the filter cannot or does not want to process the content, it is expected to respond with an "error" status.
packet: git< status=error packet: git< 0000
If the filter experiences an error during processing, then it can send the status "error" after the content was (partially or completely) sent.
packet: git< status=success packet: git< 0000 packet: git< HALF_WRITTEN_ERRONEOUS_CONTENT packet: git< 0000 packet: git< status=error packet: git< 0000
In case the filter cannot or does not want to process the content as well as any future content for the lifetime of the Git process, then it is expected to respond with an "abort" status at any point in the protocol.
packet: git< status=abort packet: git< 0000
Git neither stops nor restarts the filter process in case the
"error"/"abort" status is set. However, Git sets its exit code
according to the filter.<driver>.required flag, mimicking the
behavior of the filter.<driver>.clean / filter.<driver>.smudge
mechanism.
If the filter dies during the communication or does not adhere to
the protocol then Git will stop the filter process and restart it
with the next file that needs to be processed. Depending on the
filter.<driver>.required flag Git will interpret that as error.
Delay
If the filter supports the "delay" capability, then Git can send the flag "can-delay" after the filter command and pathname. This flag denotes that the filter can delay filtering the current blob (e.g. to compensate network latencies) by responding with no content but with the status "delayed" and a flush packet.
packet: git> command=smudge packet: git> pathname=path/testfile.dat packet: git> can-delay=1 packet: git> 0000 packet: git> CONTENT packet: git> 0000 packet: git< status=delayed packet: git< 0000
If the filter supports the "delay" capability then it must support the "list_available_blobs" command. If Git sends this command, then the filter is expected to return a list of pathnames representing blobs that have been delayed earlier and are now available. The list must be terminated with a flush packet followed by a "success" status that is also terminated with a flush packet. If no blobs for the delayed paths are available, yet, then the filter is expected to block the response until at least one blob becomes available. The filter can tell Git that it has no more delayed blobs by sending an empty list. As soon as the filter responds with an empty list, Git stops asking. All blobs that Git has not received at this point are considered missing and will result in an error.
packet: git> command=list_available_blobs packet: git> 0000 packet: git< pathname=path/testfile.dat packet: git< pathname=path/otherfile.dat packet: git< 0000 packet: git< status=success packet: git< 0000
After Git received the pathnames, it will request the corresponding blobs again. These requests contain a pathname and an empty content section. The filter is expected to respond with the smudged content in the usual way as explained above.
packet: git> command=smudge packet: git> pathname=path/testfile.dat packet: git> 0000 packet: git> 0000 # empty content! packet: git< status=success packet: git< 0000 packet: git< SMUDGED_CONTENT packet: git< 0000 packet: git< 0000 # empty list, keep "status=success" unchanged!
Example
A long running filter demo implementation can be found in
contrib/long-running-filter/example.pl located in the Git
core repository. If you develop your own long running filter
process then the GIT_TRACE_PACKET environment variables can be
very helpful for debugging (see git[1]).
Please note that you cannot use an existing filter.<driver>.clean
or filter.<driver>.smudge command with filter.<driver>.process
because the former two use a different inter process communication
protocol than the latter one.
Interaction between checkin/checkout attributes
In the check-in codepath, the worktree file is first converted
with filter driver (if specified and corresponding driver
defined), then the result is processed with ident (if
specified), and then finally with text (again, if specified
and applicable).
In the check-out codepath, the blob content is first converted
with text, and then ident and fed to filter.
Merging branches with differing checkin/checkout attributes
If you have added attributes to a file that cause the canonical repository format for that file to change, such as adding a clean/smudge filter or text/eol/ident attributes, merging anything where the attribute is not in place would normally cause merge conflicts.
To prevent these unnecessary merge conflicts, Git can be told to run a
virtual check-out and check-in of all three stages of each file that
needs a three-way content merge, by setting the merge.renormalize
configuration variable. This prevents changes caused by check-in
conversion from causing spurious merge conflicts when a converted file
is merged with an unconverted file.
As long as a "smudge→clean" results in the same output as a "clean" even on files that are already smudged, this strategy will automatically resolve all filter-related conflicts. Filters that do not act in this way may cause additional merge conflicts that must be resolved manually.
Generating diff text
diff
The attribute diff affects how Git generates diffs for particular
files. It can tell Git whether to generate a textual patch for the path
or to treat the path as a binary file. It can also affect what line is
shown on the hunk header @@ -k,l +n,m @@ line, tell Git to use an
external command to generate the diff, or ask Git to convert binary
files to a text format before generating the diff.
- Set
-
A path to which the
diffattribute is set is treated as text, even when they contain byte values that normally never appear in text files, such as NUL. - Unset
-
A path to which the
diffattribute is unset will generateBinaryfilesdiffer(or a binary patch, if binary patches are enabled). - Unspecified
-
A path to which the
diffattribute is unspecified first gets its contents inspected, and if it looks like text and is smaller than core.bigFileThreshold, it is treated as text. Otherwise it would generateBinaryfilesdiffer. - String
-
Diff is shown using the specified diff driver. Each driver may specify one or more options, as described in the following section. The options for the diff driver "foo" are defined by the configuration variables in the "diff.foo" section of the Git config file.
Defining an external diff driver
The definition of a diff driver is done in gitconfig, not
gitattributes file, so strictly speaking this manual page is a
wrong place to talk about it. However…
To define an external diff driver jcdiff, add a section to your
$GIT_DIR/config file (or $HOME/.gitconfig file) like this:
[diff "jcdiff"] command = j-c-diff
When Git needs to show you a diff for the path with diff
attribute set to jcdiff, it calls the command you specified
with the above configuration, i.e. j-c-diff, with 7
parameters, just like GIT_EXTERNAL_DIFF program is called.
See git[1] for details.
If the program is able to ignore certain changes (similar to
git diff --ignore-space-change), then also set the option
trustExitCode to true. It is then expected to return exit code 1 if
it finds significant changes and 0 if it doesn’t.
Setting the internal diff algorithm
The diff algorithm can be set through the diff.algorithm config key, but
sometimes it may be helpful to set the diff algorithm per path. For example,
one may want to use the minimal diff algorithm for .json files, and the
histogram for .c files, and so on without having to pass in the algorithm
through the command line each time.
First, in .gitattributes, assign the diff attribute for paths.
*.json diff=<name>
Then, define a "diff.<name>.algorithm" configuration to specify the diff
algorithm, choosing from myers, patience, minimal, or histogram.
[diff "<name>"] algorithm = histogram
This diff algorithm applies to user facing diff output like git-diff(1),
git-show(1) and is used for the --stat output as well. The merge machinery
will not use the diff algorithm set through this method.
|
Note
|
If diff.<name>.command is defined for path with the
diff=<name> attribute, it is executed as an external diff driver
(see above), and adding diff.<name>.algorithm has no effect, as the
algorithm is not passed to the external diff driver.
|
Defining a custom hunk-header
Each group of changes (called a "hunk") in the textual diff output is prefixed with a line of the form:
@@ -k,l +n,m @@ TEXT
This is called a hunk header. The "TEXT" portion is by default a line that begins with an alphabet, an underscore or a dollar sign; this matches what GNU diff -p output uses. This default selection however is not suited for some contents, and you can use a customized pattern to make a selection.
First, in .gitattributes, you would assign the diff attribute
for paths.
*.tex diff=tex
Then, you would define a "diff.tex.xfuncname" configuration to
specify a regular expression that matches a line that you would
want to appear as the hunk header "TEXT". Add a section to your
$GIT_DIR/config file (or $HOME/.gitconfig file) like this:
[diff "tex"]
xfuncname = "^(\\\\(sub)*section\\{.*)$"
Note. A single level of backslashes are eaten by the
configuration file parser, so you would need to double the
backslashes; the pattern above picks a line that begins with a
backslash, and zero or more occurrences of sub followed by
section followed by open brace, to the end of line.
There are a few built-in patterns to make this easier, and tex
is one of them, so you do not have to write the above in your
configuration file (you still need to enable this with the
attribute mechanism, via .gitattributes). The following built in
patterns are available:
-
adasuitable for source code in the Ada language. -
bashsuitable for source code in the Bourne-Again SHell language. Covers a superset of POSIX shell function definitions. -
bibtexsuitable for files with BibTeX coded references. -
cppsuitable for source code in the C and C++ languages. -
csharpsuitable for source code in the C# language. -
csssuitable for cascading style sheets. -
dtssuitable for devicetree (DTS) files. -
elixirsuitable for source code in the Elixir language. -
fortransuitable for source code in the Fortran language. -
fountainsuitable for Fountain documents. -
golangsuitable for source code in the Go language.