Teach "git submodule add" the --name option

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c693bfb49738c1c488574879adf3fcb0d310b450..99ed04d7abf7e0ee94feec6802e2dbf0da87f9d7 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -929,7 +929,7 @@ file at the toplevel (i.e. not in any subdirectory).  The built-in
 macro attribute "binary" is equivalent to:
 
 ------------
-[attr]binary -diff -text
+[attr]binary -diff -merge -text
 ------------