Is it safe to always git merge --no-ff (no fast-forward)?

Question

I'd like to do no-ff merges by default. But am I giving up any safety, as is the case when using rebase?

Answer 1

I would suggest to always use --no-ff so history is retained, in fact, that is the standard we use at my job, take a look at this document where we explain our git workflow

And here is a another explanation given here in stackoverflow