From d2d092335ac8bd9076f46128efec4de70bc49640 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Thu, 25 Jun 2020 11:11:48 +0200
Subject: Added my header

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

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 2aa7aac..88672f3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,7 @@
 	username = HappyTramp
 [log]
 	decorate = full
+[pull]
+	rebase = false
+[merge]
+	tool = vimdiff
-- 
cgit