From 3d218599678e9426e908d3116625173e362cdee8 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sat, 13 Jun 2020 22:12:12 +0300
Subject: [PATCH] gitconfig: pull.ff only

This fixes a warning on `git pulling` and retains consistent behaviour
across my other options that do ff unless there is letter n in the end
---
 .mikaela/gitconfig | 2 ++
 conf/gitconfig     | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index 86d12e3f..676d7a1f 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -54,3 +54,5 @@
 	program = gpgv2
 [tag]
 	forceSignAnnotated = true
+[pull]
+	ff = only
diff --git a/conf/gitconfig b/conf/gitconfig
index 88219e77..7b5fb50b 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -49,8 +49,10 @@
 [interactive]
 #    diffFilter = diff-highlight
 [gpg]
-       program = gpg2
+	program = gpg2
 [gpgv]
-       program = gpgv2
+	program = gpgv2
 [tag]
-       forceSignAnnotated = true
+	forceSignAnnotated = true
+[pull]
+	ff = only