From 755189a53becd6839dd042b2cd30a9f972074f03 Mon Sep 17 00:00:00 2001
From: Tony Duckles <tony@nynim.org>
Date: Fri, 27 Nov 2020 12:09:46 -0600
Subject: [PATCH] .gitconfig: Maintain default `pull` behavior of ff-only

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

diff --git a/.gitconfig b/.gitconfig
index b783b86..9cb3982 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -88,6 +88,10 @@
 	newNormal = nobold
 	newHighlight = green bold black
 
+[pull]
+	rebase = false
+	ff = only
+
 [push]
 	default = matching
 
-- 
2.45.2