merge-recursive: get rid of the index_only global variable

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 19938879376b635feeb6477e73e1e3e1e821d9cb..1f23d27a61dc01a5d3988afe4593f61ee3434c4d 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -315,10 +315,14 @@ patterns are available:
 
 - `pascal` suitable for source code in the Pascal/Delphi language.
 
+- `python` suitable for source code in the Python language.
+
 - `ruby` suitable for source code in the Ruby language.
 
 - `tex` suitable for source code for LaTeX documents.
 
+- `html` suitable for HTML/XHTML documents.
+
 
 Performing a three-way merge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~