Git Cheatsheet

Ezra Cheatsheet
  • for seeing conflicted files: git diff --name-only --diff-filter=U