git pull only ff

2020-06-21 13:22:31 +02:00 · 2020-06-21 13:22:31 +02:00 · 46ffb6008b
parent 6a44a2a0a0
commit 46ffb6008b
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -15,3 +15,5 @@
  branch = false
  config = false
  stash = false
+[pull]
+	ff = only