Documentation: describe 'union' low-level merge driver

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 2c48936fcd72c5276ae2fed217bd9b9564342f03..3f59705686cf1f9605fa9c76e8009cd2a482cd9e 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -21,6 +21,9 @@ add::
        repository is cloned at the specified path, added to the
        changeset and registered in .gitmodules.   If no path is
        specified, the path is deduced from the repository specification.
+       If the repository url begins with ./ or ../, it is stored as
+       given but resolved as a relative path from the main project's
+       url when cloning.
 
 status::
        Show the status of the submodules. This will print the SHA-1 of the
@@ -65,7 +68,8 @@ FILES
 When initializing submodules, a .gitmodules file in the top-level directory
 of the containing repository is used to find the url of each submodule.
 This file should be formatted in the same way as $GIR_DIR/config. The key
-to each submodule url is "submodule.$name.url".
+to each submodule url is "submodule.$name.url".  See gitlink:gitmodules[5]
+for details.
 
 
 AUTHOR