jcartledge/README.md

Created December 4, 2012 10:26

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

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

Download ZIP

git fix alias to help resolving merge/rebase conflicts: opens all unmerged files in sublimetext

Raw

This one-liner will create a git fix alias in your ~/.gitconfig file.

When a git merge or rebase fails with conflicts, git fix will open all the unmerged files in sublimetext.

Change subl -nw to $EDITOR or whatever you prefer if you don't use sublimetext.

Raw

git config --global alias.fix '!git status -s|grep "^U"|cut -d " " -f 2|xargs subl -nw'

Author

jcartledge commented Dec 9, 2012

Needs work - doesn't identify cases like AA, AD, DA etc.

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