Since I mostly use git I have 'st' aliased in my .bashrc

Also git dt = git difftool

Default difftool set to http://www.kaleidoscopeapp.com/

EDIT: Forgot about the following: core.editor = mate -w alias.unstage = reset HEAD --

mate -w opens text mate (http://macromates.com/) in blocking mode.