From 60c31c1bd5efd8e1860453101b894de931e44de2 Mon Sep 17 00:00:00 2001
From: Mike Detwiler <mike@detwiler.io>
Date: Sun, 20 Dec 2020 10:01:43 -0500
Subject: [PATCH] Issue #83: Update git pull configuration (#84)

Signed-off-by: Mike Detwiler <mike@detwiler.io>
---
 data/git/.gitconfig.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/git/.gitconfig.in b/data/git/.gitconfig.in
index 9b6c898..309aa8b 100644
--- a/data/git/.gitconfig.in
+++ b/data/git/.gitconfig.in
@@ -19,4 +19,6 @@
 	submodulesummary = 1
 [push]
 	recurseSubmodules = check
+[pull]
+	ff = only
 @GIT_CRED_HELPER_FILE@