Merge branch 'mg/maint-pull-suggest-upstream-to'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:24:59 +0000 (15 10:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:24:59 +0000 (15 10:24 -0800)
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


Trivial merge