add a little note about --no-ff merges