Stomping a local git branch with the remote

When somebody rebases their PR, my local copy of that branch gets out of sync:

➜  keel git:(fix-paused-events) git status
On branch fix-paused-events
Your branch and 'luispollo/fix-paused-events' have diverged,
and have 8 and 16 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

I just want my local copy to reflect the remote one.

I created a “stomp” alias that resets my local branch with the upstream:

[alias]
    stomp = !git reset $(git status -sb | cut -d'.' -f4 | awk '{print 
$1}') --hard

Advertisement