Skip to content

Instantly share code, notes, and snippets.

@matiasherranz

matiasherranz/gist:7322372

Created November 5, 2013 17:05
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save matiasherranz/7322372 to your computer and use it in GitHub Desktop.
Save matiasherranz/7322372 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.sh
git config --global alias.conflicts "diff --name-only --diff-filter=U"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment