Skip to content

Instantly share code, notes, and snippets.

@jccovey
Created September 28, 2012 19:54
Show Gist options
  • Save jccovey/3801795 to your computer and use it in GitHub Desktop.
Save jccovey/3801795 to your computer and use it in GitHub Desktop.
Git aliases
# Show files with conflicting changes
git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment