From 57465f87a41d5c2ecfa7e60089d40998461e1032 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Thu, 15 Apr 2021 22:26:50 +0200
Subject: [PATCH] set ff only

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index a41e22c..8d40eb4 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -27,3 +27,5 @@
     last = "!l() { ${EDITOR} $(git diff-tree --no-commit-id --name-only -r HEAD ); }; l"
 [rebase]
     autosquash = true
+[pull]
+	ff = only