From d13d173569995c41159a6d83d98c25b3f912f798 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 21 Sep 2020 12:36:51 +0000
Subject: [PATCH] Added some words, updated emacs, rebase bu default on pull

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