Git tips Overwrite pull git fetch --all && git reset --hard origin/master List all the conflicted files git diff --name-only --diff-filter=U See commit history for just the current branch git cherry -v master What changed since two weeks? git whatchanged --since='2 weeks ago' Modify previous commit without modifying the commit message git add --all && git commit --amend --no-edit Open all conflicted files in editor git diff --name-only | uniq | xargs $EDITOR List commits and changes to a specific file (even through renaming) git log --follow -p -- <file_path> Edit commit name git commit --amend -m "<new-commit-message>"