diff --git a/.gitconfig b/.gitconfig
index 04e9618..fd23d2b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,7 @@
 	email = tom@ryuslash.org
 [core]
 	editor = emacs -nw
+	whitespace = trailing-space,tab-in-indent,space-before-tab
 [color]
 	ui = auto
 [alias]