Back

Ever find yourself in a situation where you prefer the (dangerous) flexibility of rebasing onto a target branch before merge, but still need to generate merge commits for your more visually git graph-oriented teammates? This seems to work nicely for me:

in .git/config
```
[includeIf "onbranch:branch-glob-*"]
path = merge-ff.config
```

in .git/merge-ff.config
```
[merge]
ff = false
[pull]
ff = only
```

you can also set `pull.ff = true` if you are ok with merge commits on pull. Enjoy!