From dc5043e4d70f5a84148f7121f63933196eaa21c0 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jeremydkaplan@gmail.com>
Date: Mon, 12 Oct 2015 02:10:53 -0400
Subject: [PATCH] Update git config

---
 git/config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/git/config b/git/config
index af2e623..5a2cdb9 100644
--- a/git/config
+++ b/git/config
@@ -7,3 +7,7 @@
 	default = simple
 [alias]
     lg = log --oneline --graph --decorate
+[merge]
+	ff = false
+[credential]
+	helper = cache