From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 6 Nov 2012 10:29:01 +0000 (+0100)
Subject: push/pull: adjust missing upstream help text to changed interface
X-Git-Tag: v1.8.0.1~6^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a3a4391abfeb664d8239b232bbee32b2163c10bd;p=git-core%2Fgit.git

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>
---

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 484b2e61c..0e87e0915 100644
--- 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