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 <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narebski committed
Nov 1, 2008 at 06:24 UTC
4f73e240f98c38e608afe68887639c6e63b1d18f
1 file changed
+6
Documentation/gitattributes.txt
+6
@@ -213,6 +213,9 @@ with `crlf`, and then `ident` and fed to `filter`.
213
Generating diff text
214
~~~~~~~~~~~~~~~~~~~~
215
216
+`diff`
217
+^^^^^^
218
+
219
The attribute `diff` affects if 'git-diff' generates textual
220
patch for the path or just says `Binary files differ`. It also
221
can affect what line is shown on the hunk header `@@ -k,l +n,m @@`
@@ -323,6 +326,9 @@ patterns are available:
326
Performing a three-way merge
327
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
328
329
+`merge`
330
+^^^^^^^
331
+
332
The attribute `merge` affects how three versions of a file is
333
merged when a file-level merge is necessary during `git merge`,
334
and other programs such as `git revert` and `git cherry-pick`.