git: pull ff only
This commit is contained in:
parent
0b5b02590e
commit
0638a155f2
1 changed files with 2 additions and 0 deletions
|
@ -13,3 +13,5 @@
|
||||||
path = .gitconfig.local
|
path = .gitconfig.local
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
|
|
Loading…
Reference in a new issue