Created
November 28, 2012 04:23
-
-
Save lilyball/4159011 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git config --global alias.ksreview '!f() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool -y -t Kaleidoscope $BRANCH...$SHA; }; f' |
This isn't working for me. I'm getting the following error:
Unknown merge tool Kaleidoscope
@lowellk, I get the same problem. Any luck?
Stumbled upon this thread and found my solution here, hope this helps somebody https://superuser.com/questions/689853/kaleidoscope-for-git-difftool
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Does this assume bash is the default shell? For those of us using fish as the default shell, is there a way to modify the above to explicitly run those commands via bash?