Merge branch 'da/p4merge-mktemp' into maint

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 484b2e61ccd6df166a8d6447556ccca4236840ad..0e87e0915ee16e36385aa4182b3a4271d1308641 100644 (file)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -80,7 +80,7 @@ See git-${cmd}(1) for details
 
 If you wish to set tracking information for this branch you can do so with:
 
-    git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>
+    git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
 "
        fi
        exit 1