vmanselon
11/2/2017 - 1:42 AM

Pull and ignore local changes

Keeping the work you've done

$ git reset --soft HEAD~1

Destroying the work you've done

$ git reset --hard HEAD~1

Pull and ignore local changes

$ git reset --hard
$ git pull