git:pull: Use fast-forward only

If I cannot fast-forward I want to stop and think about how I want to continue (merge or rebase).
2021-05-16 00:51:29 +02:00
parent 44ef15d8ab
commit 06d37a273c
1 changed files with 1 additions and 0 deletions
--- a/.config/git/config
+++ b/.config/git/config
@@ -27,6 +27,7 @@
 	path = user.config
 [pull]
 	rebase = true
 	ff = yes
 [merge]
 	log = true
 	tool = nvimdiff