From 3fd1c18cec42cfcd92d15997d8104a1be80af3bc Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Tue, 20 Feb 2018 17:09:34 +0900
Subject: [PATCH] Add git config pull.ff only

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9d48675..f2dd6ed 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,7 @@ else
 	$(git_conf) status.showUntrackedFiles normal
 	$(git_conf) log.date iso
 	$(git_conf) push.default current
+	$(git_conf) pull.ff only
 ifneq (,$(xz))
 	$(git_conf) tar.txz.command "xz -c"
 endif