git reset [commit] # reset local to that commit git stash # save changes git push -f # force push to remote git stash pop # load changes git status # commit list has change to that commit with changes after it