git commands and aliases

gistfile1.md

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"