Xcode 4 and git merge --no-ff

Question

I like the integration of git in Xcode 4, but when performing a merge it seems that Xcode will do the default merge with fast forward. I like to maintain separate branches of my function. Does anyone know if merging Xcode is possible without fast-forward?

Answer 1

You can try to set the configuration

branch.<name>.mergeoptions 

Sets default options for branching .
The syntax and supported parameters are the same as git-merge , but parameter values ​​containing whitespace are not currently supported.

So you can add --no-ff there and see if XCode4 supports the configuration for your feature branch.

As Yitschak adds in the comments :

 git config branch.<name>.mergeoptions --no-ff