1 files changed, 10 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 07f45aa..e97cccb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,3 +5,13 @@
 	email = bnewbold@robocracy.org
 [color]
 	ui = true
+[alias]
+    cdiff = diff --word-diff=color
+[github]
+	user = bnewbold
+[difftool]
+    prompt = false
+[difftool "diffoscope"]
+    cmd = "if [ $LOCAL = /dev/null ]; then diffoscope --new $REMOTE; else diffoscope $LOCAL $REMOTE; fi"
+[difftool "diffoscope-html"]
+    cmd = "if [ $LOCAL = /dev/null ]; then diffoscope --new $REMOTE --html - | bcat; else diffoscope $LOCAL $REMOTE --html - | bcat; fi"