From 8293e683658f3c322197603b9315c671e02136e6 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Thu, 15 May 2014 12:25:30 -0700
Subject: [PATCH] update gitconfig

merge no-ff, new branches auto rebase
---
 git/gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git/gitconfig b/git/gitconfig
index e0594de..5ca7472 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -32,5 +32,8 @@
     todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
 [merge]
     tool = vimdiff
+    ff = false
 [push]
     default = current
+[branch]
+    autosetuprebase = always