From 56ff7a788d68420c7ab17aad324d42cfdec5a145 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 6 Nov 2015 15:46:02 -0500
Subject: Clean up git configs

---
 .gitconfig | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index bd8e0b4a..14274a19 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,20 +5,18 @@
 	editor = vim
 	excludesfile = ~/.gitignore.global
 	autocrlf = input
+[push]
+	default = simple
+[help]
+	autocorrect = 1
+[color]
+	ui = true
 [sendemail]
 	smtpencryption = tls
 	smtpserver = smtp.gmail.com
 	smtpuser = programble@gmail.com
 	smtpserverport = 587
-[merge]
-	tool = vimdiff
-[color]
-	ui = true
-[push]
-	default = simple
-[include]
-	path = .gitconfig.private
 [github]
 	user = programble
-[help]
-	autocorrect = 1
+[include]
+	path = .gitconfig.private
-- 
cgit 1.4.1