Skip to content

Instantly share code, notes, and snippets.

@lilyball

lilyball/gist:4159011

Created November 28, 2012 04:23
Show Gist options
  • Star 3 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save lilyball/4159011 to your computer and use it in GitHub Desktop.
Save lilyball/4159011 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.sh
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'
@justinmayer
Copy link

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?

@lowellk
Copy link

lowellk commented Jan 31, 2013

This isn't working for me. I'm getting the following error:

Unknown merge tool Kaleidoscope

@marclundgren
Copy link

@lowellk, I get the same problem. Any luck?

@IsaiahPacheco
Copy link

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