From f537641d27959a0ba241178bb19f191e3808b469 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 30 May 2019 01:20:27 +1200
Subject: Remove most of git config; time to review it

---
 git/gitconfig.mi5 | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index eeb99406..f1461179 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -1,59 +1,14 @@
-[advice]
-    statusHints = false
-    detachedHead = false
-    implicitIdentity = false
-    pushUpdateRejected = false
-
-[alias]
-    amend = commit --amend
-    ls = log --oneline
-    others = ls-files --others --exclude-standard
-    fuckit = "!git clean -dfx ; git reset --hard"
-
-[color]
-    ui = true
-
-[commit]
-    status = false
-
-[core]
-    compression = 9
-
-[diff]
-    algorithm = patience
-    tool = vimdiff
-
-[difftool]
-    prompt = false
-
-[fetch]
-    output = compact
-    prune = true
-
-[grep]
-    extendRegexp = true
-    lineNumber = true
-
 [init]
     templateDir = ~/.git-template
 
-[log]
-    date = local
-    decorate = short
-
 [merge]
     ff = false
-    log = 500
-
-[pager]
-    diff = cat
 
 [pull]
     ff = only
 
 [push]
     default = current
-    followTags = true
 
 [sendemail]
     confirm = compose
@@ -61,7 +16,6 @@
 
 [status]
     short = true
-    showUntrackedFiles = all
 
 [user]
     name = <% NAME %>
-- 
cgit v1.2.3


From c1af0cb935d383b5112a179f209bf66a0e388188 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 30 May 2019 01:21:11 +1200
Subject: Restore Git merge.log config to 1024 commits

---
 git/gitconfig.mi5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index f1461179..02344e9a 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -3,6 +3,7 @@
 
 [merge]
     ff = false
+    log = 1024
 
 [pull]
     ff = only
-- 
cgit v1.2.3


From 11c6185224f1a5df4193119fe21d5dbf43fae088 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 30 May 2019 11:40:31 +1200
Subject: Restore log settings

---
 git/gitconfig.mi5 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index 02344e9a..060c3a78 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -1,6 +1,10 @@
 [init]
     templateDir = ~/.git-template
 
+[log]
+    date = local
+    decorate = short
+
 [merge]
     ff = false
     log = 1024
-- 
cgit v1.2.3


From b0998ab17590baf001d70e2cb5dc9273284dbe94 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 30 May 2019 11:42:21 +1200
Subject: Bump VERSION

---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index e50cd32c..7b4ebf12 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.10.0
-Wed May 29 12:50:49 UTC 2019
+tejr dotfiles v5.11.0
+Wed May 29 23:42:21 UTC 2019
-- 
cgit v1.2.3