git pull only ff
This commit is contained in:
parent
6a44a2a0a0
commit
46ffb6008b
1 changed files with 2 additions and 0 deletions
|
@ -15,3 +15,5 @@
|
||||||
branch = false
|
branch = false
|
||||||
config = false
|
config = false
|
||||||
stash = false
|
stash = false
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
|
|
Loading…
Reference in a new issue