From 81324225e9b61603b063d9216f156ee1b1320504 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Fri, 26 Sep 2014 20:26:09 -0400
Subject: [PATCH] Stealing some gitconfig settings from work

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

diff --git a/gitconfig b/gitconfig
index 19c9aeb..0aedc74 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,16 +7,23 @@
 
 [core]
 	excludesfile = ~/.git-global-ignores
+	editor = vim
+	filemode = true
 	autocrlf = false
 	pager = less -FRX
 
+[branch]
+	autosetuprebase = remote
+	autosetupmerge = true
+	mergeoptions = --no-commit --no-ff
+
 [daemon]
 	uploadpack = true
 	uploadarch = true
 	receivepack = true
 
 [push]
-	default = matching
+	default = current
 
 [color]
 	ui = auto
@@ -77,7 +84,6 @@
 
 	logv = log --name-status
 
-
 [clean]
 	requireForce = false