Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
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

This comment has been minimized.

Copy link

justinmayer commented Jan 18, 2013

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

This comment has been minimized.

Copy link

lowellk commented Jan 31, 2013

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

Unknown merge tool Kaleidoscope
@marclundgren

This comment has been minimized.

Copy link

marclundgren commented May 23, 2014

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

@IsaiahPacheco

This comment has been minimized.

Copy link

IsaiahPacheco commented Nov 17, 2015

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
You can’t perform that action at this time.