ph-One/git-conflict-alias

Created September 23, 2014 23:33

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

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/ph-One/dc34b23a242dc536a1bb.js"></script>
Save ph-One/dc34b23a242dc536a1bb to your computer and use it in GitHub Desktop.

Download ZIP

Git Conflicts Alias

Raw

git-conflict-alias

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