git save-merge

When merging to production branches you might want to be overly careful. I do, so i aliased this in my .gitconfig:

[alias]
    smerge = merge --no-ff --no-commit