Revert the no-ff Git change.

This commit is contained in:
Scott Wallace 2015-09-15 19:39:44 +01:00
parent 22afd81596
commit 52ffbcf0e7

View file

@ -26,5 +26,3 @@
ui = true ui = true
[branch] [branch]
autosetuprebase = always autosetuprebase = always
[merge]
ff = false