Skip to content

Instantly share code, notes, and snippets.

@mjlescano
Created January 7, 2016 19:37
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mjlescano/ed62e9d81430c0144c95 to your computer and use it in GitHub Desktop.
Save mjlescano/ed62e9d81430c0144c95 to your computer and use it in GitHub Desktop.
Open all files with merge conflicts (with Sublime). From: https://coderwall.com/p/dy86xg/open-all-files-with-merge-conflicts-with-sublime
git config --global alias.cf '!sh -c "git diff --name-only | uniq | xargs subl"'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment