diff --git a/tilde/gitconfig b/tilde/gitconfig
index cbaee30..b346976 100644
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@@ -7,7 +7,8 @@
     old = red bold
     new = green bold
 [core]
-    editor = vim
+    # Force vim in foreground mode.
+    editor = vim -f
     # http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
     # If doesn't work, try: pager = less -+$LESS -FRX
     pager = less -r