On 02/21/2010 06:59 PM, Bryan Alves wrote: > Add a new configuration option, merge.allowfastforward > > When set to false, causes --no-ff to be the default behavior > for merges. When set to true, or not present, the default > behavior is unchanged, and acts like --ff is set. The subject says --no-ff configuration but the option is for --ff. Sounds confusing. In other words, shouldn't it be merge.disallowfastforward or merge.nofastforward? Or maybe the subject should be "merge: --ff configuration setting" Also could you just use branch.<name>.mergeoptions and not introduce yet another config option? Or maybe there's some reasoning why you always want to have merge commits in your workflow? Finally if this goes in please add a description to Documentation/config.txt -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html