From 517aa18403a95ee0b899ccaffba3267cc3e6e798 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Mon, 27 Sep 2021 17:03:37 +0100
Subject: [PATCH] Prefer ff over rebase

---
 roles/home-cli/files/gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/home-cli/files/gitconfig b/roles/home-cli/files/gitconfig
index 1ac0682..517be95 100644
--- a/roles/home-cli/files/gitconfig
+++ b/roles/home-cli/files/gitconfig
@@ -1,7 +1,7 @@
 [core]
 	autocrlf = input
 [pull]
-	rebase = true
+	ff = only
 [push]
 	default = simple
 [color]