From ffcadeaf3172f3b881fb7db8eb31c91546cbfcb3 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 09 Oct 2020 10:54:35 +0000
Subject: [PATCH] updated emacs

---
 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