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
2020-06-13 22:12:12 +03:00 · 2020-06-13 22:12:12 +03:00 · 3d21859967
parent 8ea8012153
commit 3d21859967
2 changed files with 7 additions and 3 deletions
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@ -54,3 +54,5 @@
 	program = gpgv2
 [tag]
 	forceSignAnnotated = true
+[pull]
+	ff = only
--- 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