milenkovicm/gist:2404485

Created April 17, 2012 08:20

Select an option

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

git commands and aliases

Raw

Simplest way to git a list of conflicted files

$git ls-files -u | cut -f 2 | sort -u

$git ls-files -u | awk '{print $4}' | sort | uniq

or just add an alias

$git config --global alias.conflicts "!git ls-files -u | cut -f 2 | sort -u"