git: ff only globally
This commit is contained in:
parent
08489f7422
commit
8a44557661
|
@ -14,6 +14,7 @@
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
ff = only
|
||||||
[merge]
|
[merge]
|
||||||
tool = meld
|
tool = meld
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user