git: enable rerere

[dotfiles.git] / aliases

diff --git a/aliases b/aliases
index 92baf77c59a73bfcbf2879c72663b1e625a8015e..a1641cba6a2943cee65a2f0fb2ad0942213c9c9b 100644 (file)
--- a/aliases
+++ b/aliases
@@ -19,13 +19,13 @@ alias svi='sudo -e'
 alias vs='vim SPLITBUILD'
 
 # colours, I want more colours
-alias diff='colordiff'
+[[ -x /usr/bin/colordiff ]] && alias diff='colordiff'
 
 # colours and case insensitive search
 export LESS='-RSi'
 
 # yes I'm that lazy
-alias o='mimeo'
+alias o='rifle'
 
 # suspend screensaver when vlc is running
 alias vlc-suspend='xdg-screensaver suspend $(xprop -name vlc | grep "WM_CLIENT_LEADER(WINDOW)" | sed "s/.*\(0x\d*\)/\1/")'