Don't do --no-ff merges for feature branches that exist of a single commit (no benefits are gained in those situations, only complexity is added).