push/pull: adjust missing upstream help text to changed interface
authorMichael J Gruber <git@drmicha.warpmail.net>
Tue, 6 Nov 2012 10:29:01 +0000 (11:29 +0100)
committerJeff King <peff@peff.net>
Thu, 8 Nov 2012 16:32:38 +0000 (11:32 -0500)
commita3a4391abfeb664d8239b232bbee32b2163c10bd
tree830c8e5770a941189c82827219a07ed27c6ac788
parent7e2010537e96d0a1144520222f20ba1dc3d61441
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>
git-parse-remote.sh