From c7ce324561879f1bfa8f09d138ce75dd4971050c Mon Sep 17 00:00:00 2001
From: Joseph Groocock <frebib@gmail.com>
Date: Sat, 2 Apr 2016 19:45:25 +0100
Subject: [PATCH] Tidy up .gitconfig

---
 .gitconfig | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 8c276ce..547b40d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,17 @@
-[push]
-	default = simple
 [user]
 	name = Joseph Groocock
 	email = frebib@gmail.com
+	signingkey = CFBB6A86
+
+[color]
+	ui = auto
+
+[rebase]
+    autoStash = true
+
+[push]
+	default = upstream
+
+[advice]
+	statusHints = false
+	pushUpdateRejected = false