push/pull: adjust missing upstream help text to changed interface
In case of a missing upstream, the git-parse-remote script suggests: If you wish to set tracking information for this branch you can do so with: git branch --set-upstream nsiv2 origin/<branch> But --set-upstream is deprectated. Change the suggestion to: git branch --set-upstream-to=origin/<branch> nsiv2 Reported-by: Jeroen van der Ham <vdham@uva.nl> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net>
Michael J Gruber committed
Nov 6, 2012 at 11:29 UTC
a3a4391abfeb664d8239b232bbee32b2163c10bd
1 file changed
+1
-1
git-parse-remote.sh
+1
-1
@@ -80,7 +80,7 @@ See git-${cmd}(1) for details
80
81
If you wish to set tracking information for this branch you can do so with:
82
83
- git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>
83
+ git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
84
"
85
fi
86
exit 1