Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
format-patch: use default diff format even with patch options
[gitweb.git]
/
Documentation
/
gitattributes.txt
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index 9279df5349889a7e6d133b7503c7ef3e8f492364..5495d695c6f61982e01e2276d108b15dddb16c52 100644
(file)
--- a/
Documentation/gitattributes.txt
+++ b/
Documentation/gitattributes.txt
@@
-322,6
+322,8
@@
patterns are available:
- `tex` suitable for source code for LaTeX documents.
+- `html` suitable for HTML/XHTML documents.
+
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~