Skip to content

Commit 4f73e24

Browse files
jnarebgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8c17868 commit 4f73e24

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Documentation/gitattributes.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ with `crlf`, and then `ident` and fed to `filter`.
213213
Generating diff text
214214
~~~~~~~~~~~~~~~~~~~~
215215

216+
`diff`
217+
^^^^^^
218+
216219
The attribute `diff` affects if 'git-diff' generates textual
217220
patch for the path or just says `Binary files differ`. It also
218221
can affect what line is shown on the hunk header `@@ -k,l +n,m @@`
@@ -323,6 +326,9 @@ patterns are available:
323326
Performing a three-way merge
324327
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
325328

329+
`merge`
330+
^^^^^^^
331+
326332
The attribute `merge` affects how three versions of a file is
327333
merged when a file-level merge is necessary during `git merge`,
328334
and other programs such as `git revert` and `git cherry-pick`.

0 commit comments

Comments
 (0)