From 86a29e30b39f93dcfb9b6cf41933b441f6b9aef5 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 14 Aug 2021 05:14:59 +0000
Subject: [PATCH] Merge branch 'master' of github.com:Chizi123/Dotfiles

---
 git/.gitconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 9a72e44..fdf61bd 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = Joel Grunbaum
 	email = joelgrun@gmail.com
+[pull]
+	rebase = false

--
Gitblit v1.10.0