contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 484b2e61ccd6df166a8d6447556ccca4236840ad..55fe8d56c9d5107df0843378ef137d64a48b2980 100644 (file)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+# This is a shell library to calculate the remote repository and
+# upstream branch that should be pulled by "git pull" from the current
+# branch.
 
 # git-ls-remote could be called from outside a git managed repository;
 # this would fail in that case and would issue an error message.
@@ -80,7 +82,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