From 00b8af17159441412eb02d88d0243e29cbae878b Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.cc>
Date: Thu, 24 Oct 2013 10:10:22 +0200
Subject: [PATCH] Add colordiff, alias + config

---
 bash_aliases |  1 +
 colordiffrc  | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 colordiffrc

diff --git a/bash_aliases b/bash_aliases
index 04a9d23..bdb4218 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -29,5 +29,6 @@ alias alert='notify-send --urgency=low -i "$([ $? -eq 0 ] && echo terminal || ec
 alias git-patch='git diff --minimal --find-renames --find-copies --relative ./ > ../$(basename `pwd`).patch && git co -- ./'
 alias ssh-add-all='for a in .ssh/id_*; do ssh-add $a; done;'
 alias screen='screen -RU'
+alias cdiff="colordiff"
 xmlformat () { xmllint --format "$1" | unexpand -t 2 --first-only; }
 alias jjar='java -jar'
diff --git a/colordiffrc b/colordiffrc
new file mode 100644
index 0000000..cea5ac4
--- /dev/null
+++ b/colordiffrc
@@ -0,0 +1,29 @@
+# Example colordiffrc file for dark backgrounds
+#
+# Set banner=no to suppress authorship info at top of
+# colordiff output
+banner=no
+# By default, when colordiff output is being redirected
+# to a file, it detects this and does not colour-highlight
+# To make the patch file *include* colours, change the option
+# below to 'yes'
+color_patches=no
+# Sometimes it can be useful to specify which diff command to
+# use: that can be specified here
+diff_cmd=diff
+# 
+# available colours are: white, yellow, green, blue,
+#                        cyan, red, magenta, black,
+#                        darkwhite, darkyellow, darkgreen,
+#                        darkblue, darkcyan, darkred,
+#                        darkmagenta, darkblack
+#
+# Can also specify 'none', 'normal' or 'off' which are all
+# aliases for the same thing, namely "don't colour highlight
+# this, use the default output colour"
+#
+plain=off
+newtext=green
+oldtext=red
+diffstuff=cyan
+cvsstuff=white