From b8367c5bf353a888f647c737adabd8bd33ea9f43 Mon Sep 17 00:00:00 2001
From: Adam Hellberg <sharparam@sharparam.com>
Date: Sun, 6 Dec 2020 01:56:50 +0100
Subject: [PATCH] Change default behaviour of `git pull`

Instead of `rebase = true`, set `ff = only`.
This makes it so *only* fast-forward pulls are allowed when issuing
`git pull`. If a merge or rebase is required to pull down changes, it
has to be an active choice.
---
 git/.gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index df12f5a..937c886 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -17,7 +17,8 @@
 [branch "develop"]
   mergeoptions = --no-ff
 [pull]
-  rebase = true
+  #rebase = true
+  ff = only
 [tag]
   forceSignAnnotated = true
 [ghq]
-- 
2.51.2