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:
@@ -27,6 +27,7 @@
|
||||
path = user.config
|
||||
[pull]
|
||||
rebase = true
|
||||
ff = yes
|
||||
[merge]
|
||||
log = true
|
||||
tool = nvimdiff
|
||||
|
||||
Reference in New Issue
Block a user