git: Pull ff only

2020-06-26 13:41:16 +02:00
parent 84afe0a158
commit 55a06db3fe
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,3 +10,5 @@
 	helper = cache --timeout=3600
 [color]
 	ui = auto
+[pull]
+	ff = only