git check tracking if you are having problems with remote tracking
# double -vv to check the remote tracking branch
$ git branch -vva
#* master 9d555b9 [origin/master] Merge branch 'bua-pubkey' into 'master'
# remotes/origin/HEAD -> origin/master
# remotes/origin/master 9d555b9 Merge branch 'bua-pubkey' into 'master'
# check the refs
$ git rev-parse --symbolic-full-name master@{u}
# refs/remotes/origin/master
# fix the tracking branch
$ git branch --set-upstream-to=origin/master