From fcfea39fc0763b2f525d5dd083beaab44df01227 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Tue, 30 May 2017 17:03:45 -0700
Subject: [PATCH] Updating the Git config
---
gitconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gitconfig b/gitconfig
index 91ae62f..97520ae 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,6 +3,8 @@
email = chris@codingallnight.com
[push]
default = simple
+[merge]
+ log = 20
[credential]
helper = cache --timeout=43200
[core]
@@ -11,6 +13,7 @@
editor = vim
[diff]
compactionHeuristic = true
+ algorithm = patience
[alias]
alias = config --get-regexp ^alias\\.
stat = status
--
GitLab