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

* 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-20 10:15:09 -08:00
commit 91d0cd9a6e

View File

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