From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Nov 2012 18:24:59 +0000 (-0800)
Subject: Merge branch 'mg/maint-pull-suggest-upstream-to'
X-Git-Tag: v1.8.1-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/159a5a2fa2b5da57a5b69dafc816d30c3716604f?hp=6050b5bca0f6d94d1d171d60b64ace87651383a1

Merge branch 'mg/maint-pull-suggest-upstream-to'

Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
suggesting the deprecated "--set-upstream".

* mg/maint-pull-suggest-upstream-to:
push/pull: adjust missing upstream help text to changed interface
---

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