kzim44/git-list-conflict-files

Created August 27, 2013 06:04

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/kzim44/6350110.js"></script>
Save kzim44/6350110 to your computer and use it in GitHub Desktop.

Download ZIP

Git - commandline to list file names with conflicts

Raw

git-list-conflict-files

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

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