From f30ecbd13ef1d4089e6ecbed7d718474855911d9 Mon Sep 17 00:00:00 2001
From: Alex Karle <alex@karle.co>
Date: Sat, 13 Jun 2020 23:16:08 -0400
Subject: [PATCH] git: Update config to set pull default behavior

It seems newer versions of git print a verbose warning if you type
"git pull" and don't have a default set.

In general, I want it to error if it can't fast forward (then I'll
run it again with rebase). I almost never want it to merge, but I
like to know that I had to rebase in the first place.
---
 git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/config b/git/config
index 8ca4d9d..ab977f6 100644
--- a/git/config
+++ b/git/config
@@ -11,3 +11,5 @@
 	smtpencryption = tls
 	smtpserverport = 587
         annotate = yes
+[pull]
+	ff = only
--
libgit2 0.28.4