Commit 2fecb861 authored by Daniel Stan's avatar Daniel Stan

merge is also ff-only

parent be96d1b6
......@@ -8,6 +8,6 @@
[push]
default = simple
[merge]
ff = false
ff = true
[pull]
ff = true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment