From ee35298a03a827355bd55d062f2faafc15be260a Mon Sep 17 00:00:00 2001
From: DarkWiiPlayer <darkwiiplayer@hotmail.com>
Date: Mon, 26 Nov 2018 17:30:15 +0100
Subject: [PATCH] Add more stuff to gitconfig

---
 gitconfig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index db10c0e..8587a5a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,5 +1,15 @@
+# vim: set filetype=gitconfig :miv #
 [core]
 	editor = gvim -f
+[diff]
+	tool = gvim
+[difftool]
+	confirm = false
+	prompt = false
+[merge]
+	tool = gvimdiff3
+[push]
+	default = matching
 [alias]
 	adog = log --all --decorate --oneline --graph
   ten = log --all --decorate --oneline --graph -10
@@ -8,5 +18,3 @@
 [user]
 	name = DarkWiiPlayer
 	email = darkwiiplayer@hotmail.com
-[merge]
-	tool = gvimdiff3