Revert "merge with no ff and without commit by default in git"

This reverts commit 11f2e4ead761d0c659efd35bfb2694981be0fe9b.
use only ff branches in git