From: Tony Duckles <tony@nynim.org>
Date: Fri, 27 Nov 2020 18:09:46 +0000 (-0600)
Subject: .gitconfig: Maintain default `pull` behavior of ff-only
X-Git-Url: http://git.nynim.org/dotfiles.git/commitdiff_plain/755189a53becd6839dd042b2cd30a9f972074f03

.gitconfig: Maintain default `pull` behavior of ff-only
---

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