Overwrite pull git fetch --all git reset --hard origin/master List of all the files changed in a commit git ls-tree --name-only -r <commit-ish> Git reset first commit git update-ref -d HEAD List all the conflicted files git diff --name-only --diff-filter=U List all branches that are already merged into master git checkout master git branch --merged Quickly switch to the previous branch git checkout - List all branches and their upstreams, as well as last commit on branch git branch -vv Track upstream branch git branch -u origin/mybranch