Reconfigured git to no-ff by default and use the new default(simple) for push.