halyph/gist:3931404

Forked from gitfoobar/gist:3931401

Created October 22, 2012 13:01

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

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

Download ZIP

#git list conflicted files

Raw

gistfile1.sh

git diff --name-only --diff-filter=U

Author

halyph commented Oct 22, 2012

see http://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-git-a-list-of-conflicted-files

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment