title: Xcode 4 and git merge --no-ff
body: <p>I'm liking the git integration in Xcode 4 but when doing a merge it seems Xcode will only do the default merge with fast forward. I like to keep my feature branch lines separate. Does anyone know if it's possible to have Xcode's merge be no-fast-forward?</p>