Git: no fast-forward (no-ff) when merging

Answered

Hi,

When merging one branch into another in git there are no options to select, defaults are being used. I'd love to see at least an option to choose not to fast-forward when merging. This is a -no-ff command line option and I find it very useful. If it's there somewhere and I missed it, please let me know where I could find it.

Thanks,
Piotr

3 comments

Please implement this feature! it's important to the git workflow suggested by Vincent Driessen.

1

There should be an option to make `no-ff` the default for any merge action.

When PHPStorm merges branches via the statusbar dialog, the merge dialog isn't shown and the branch still is fast forwarded.

As result of that, our pipelines don't trigger when we're pushing these ff'ed commits.

0

Please sign in to leave a comment.