diff --git a/gitconfig b/gitconfig
index ddb82314f7..8c979062af 100644
--- a/gitconfig
+++ b/gitconfig
@@ -14,7 +14,7 @@
   st = status
   br = branch
 [core]
-	excludesfile = /Users/gambaroff/.gitignore
+	excludesfile = /Users/stephania.thomas/.gitignore_global
   autocrlf = input
 [merge]
   ff = only
diff --git a/vimrc b/vimrc
index b191f03dcb..9a8ba481df 100644
--- a/vimrc
+++ b/vimrc
@@ -186,7 +186,10 @@ set noeb vb t_vb=
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+    set diffopt-=internal
+    set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")