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).
This commit is contained in:
2021-05-16 00:51:29 +02:00
parent 44ef15d8ab
commit 06d37a273c

View File

@@ -27,6 +27,7 @@
path = user.config
[pull]
rebase = true
ff = yes
[merge]
log = true
tool = nvimdiff