diff --git a/.vimrc b/.vimrc
index 4e3a535..32665a9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -50,6 +50,9 @@ function SetGPGOptions()
 endfunction
 
 if has("autocmd")
+    " To spell check all git commit messages
+    au BufNewFile,BufRead COMMIT_EDITMSG set spelllang=en_us spell nonumber nolist wrap linebreak
+
     " Set filetype tab settings
     autocmd FileType python,doctest set ai ts=4 sw=4 sts=4 et
 endif