Custom git-flow(always use --no-ff)