I have --no-ff set in my global Git configuration (because I prefer that method of merging). But when I integrate changes from upstream branches I need to be able to do a "merge --ff upstream/branch". Unless I'm missing something, the current SourceTree UI doesn't accommodate this workflow (even though it supports git-flow, which is odd).

I'd like to see a "Merge (FF) ..." entry in the context menu, and wherever else in the UI it makes sense.