We're pretty comfortable with rebase before merge being part of EE only. Someone suggested making an option to select the type of merge you want (ff, no-ff, log, rebase or squash). If someone would submit a good implementation of that and reference this comment we can open source everything. Edit: removed the work probably to make this a firm promise.