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