I\'ve been using github from a relatively short period, and I\'ve always used the client to perform commits and pulls. I decided to try it from the git bash yesterday, and I
$ git branch --set-upstream-to=heroku/master master and
$ git branch --set-upstream-to=heroku/master master
$ git pull
worked for me!