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
This commit is contained in:
Junio C Hamano 2012-11-15 10:24:59 -08:00
Родитель 6050b5bca0 a3a4391abf
Коммит 159a5a2fa2
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

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