summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-02 07:15:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-02 07:15:22 (GMT)
commitaebd173ffa7a4e67447f0157a14abde7767c54e9 (patch)
tree2c3c660e441d93120a42cfac5c909dcbd2f5b275 /Documentation/gitattributes.txt
parentf6576f4c0c6fa3b2d979faf28936c09480dedaab (diff)
parent1a9016aae5aa8c468bb2d8d5dd16303d5c005869 (diff)
downloadgit-aebd173ffa7a4e67447f0157a14abde7767c54e9.zip
git-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.gz
git-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.bz2
Merge branch 'maint'
* maint: Start 1.6.0.4 cycle add instructions on how to send patches to the mailing list with Gmail Documentation/gitattributes: Add subsection header for each attribute git send-email: avoid leaking directory file descriptors. send-pack: do not send out single-level refs such as refs/stash fix overlapping memcpy in normalize_absolute_path pack-objects: avoid reading uninitalized data correct cache_entry allocation Conflicts: RelNotes
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 24e880c..eb64841 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
~~~~~~~~~~~~~~~~~~~~
+`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 @@`
@@ -331,6 +334,9 @@ patterns are available:
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`.