summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c17868)
raw | patch | inline | side by side (parent: 8c17868)
author | Jakub Narebski <jnareb@gmail.com> | |
Sat, 1 Nov 2008 06:24:55 +0000 (06:24 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 2 Nov 2008 06:48:48 +0000 (23:48 -0700) |
This makes attributes easier to find; before this patch some
attributes had individual subsections, and some didn't.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
attributes had individual subsections, and some didn't.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt | patch | blob | history |
index 42776f089b55989200f58cf1e968a11cbbd93900..37fff208ffb6ce75911ef439ef140550a48b1a18 100644 (file)
Generating diff text
~~~~~~~~~~~~~~~~~~~~
+`diff`
+^^^^^^
+
The attribute `diff` affects if 'git-diff' generates textual
patch for the path or just says `Binary files differ`. It also
can affect what line is shown on the hunk header `@@ -k,l +n,m @@`
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+`merge`
+^^^^^^^
+
The attribute `merge` affects how three versions of a file is
merged when a file-level merge is necessary during `git merge`,
and other programs such as `git revert` and `git cherry-pick`.