Merge branch 'jp/symlink-dirs' into maint

diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt
index 41ec7774f481fd2d70492be4ab2b5e0bf887fc0b..2a0e7b89441039699a3dc9514f1165cb2112020a 100644 (file)
--- a/Documentation/urls-remotes.txt
+++ b/Documentation/urls-remotes.txt
@@ -27,10 +27,13 @@ config file would appear like this:
 ------------
        [remote "<name>"]
                url = <url>
+               pushurl = <pushurl>
                push = <refspec>
                fetch = <refspec>
 ------------
 
+The `<pushurl>` is used for pushes only. It is optional and defaults
+to `<url>`.
 
 Named file in `$GIT_DIR/remotes`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~