The following merge options are recognized, which are used for all branches:
[merge] ff = true|false|only
If you want to configure it only for a specific branch, use the following:
[branch "name"] mergeoptions = --ff|--no-ff|--ff-only
I have also expanded the description into New and Noteworthy .
source share