path: root/Documentation/gitattributes.txt
diff options
authorJakub Narebski <>2008-11-01 06:24:55 (GMT)
committerJunio C Hamano <>2008-11-02 06:48:48 (GMT)
commit4f73e240f98c38e608afe68887639c6e63b1d18f (patch)
treea90c15a63375d6ad15e6728408f99b67246ad903 /Documentation/gitattributes.txt
parent8c178687959732edab8bf91da9ed9f4fbcf7c14e (diff)
Documentation/gitattributes: Add subsection header for each attribute
This makes attributes easier to find; before this patch some attributes had individual subsections, and some didn't. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/gitattributes.txt')
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 42776f0..37fff20 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -213,6 +213,9 @@ with `crlf`, and then `ident` and fed to `filter`.
Generating diff text
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 @@`
@@ -323,6 +326,9 @@ patterns are available:
Performing a three-way 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`.