Recovering from git disasters 

$ hint upstream
reset branch to match upstream:
git reset --hard @{u}