For our current workflow, in the Merge Branch dialog we use the Merge Option combo-box value Don't commit (--no-ff --no-commit).

We want to avoid having to change the combo-box setting on every Merge. Either of the following ways to achieve this would be fine:

• Remembering (even between sessions) the most recent choice made in the combo-box. (Possibly per repo.)
• A new combo-box option Preferred Merge Option (or similar) under the Git tab in Preferences. (NOTE: This should be per-repo as well!)