matiasherranz/gist:7322372

Created November 5, 2013 17:05

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/matiasherranz/7322372.js"></script>
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