Revert the no-ff Git change.

2015-09-15 19:39:44 +01:00 · 2015-09-15 19:39:44 +01:00 · 52ffbcf0e7
parent 22afd81596
commit 52ffbcf0e7
1 changed files with 0 additions and 2 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -26,5 +26,3 @@
    ui = true
 [branch]
    autosetuprebase = always
-[merge]
-	ff = false