.gitconfig: add pull.ff=only
This commit is contained in:
parent
be3cc54465
commit
e13244fe7e
1 changed files with 2 additions and 0 deletions
|
|
@ -17,3 +17,5 @@
|
||||||
stash = false
|
stash = false
|
||||||
[diff "ansible-vault"]
|
[diff "ansible-vault"]
|
||||||
textconv = ansible-vault view
|
textconv = ansible-vault view
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue