As discussed in this post: http://ariya.ofilabs.com/2013/09/fast-forward-git-merge.html, if we still want to do fast-forward merge when possible, how to do that in SourceTree? I tried both merge in SourceTree and GitHub pull request from web, both shows non-ff merge in the graph.
(in addition to @Tim Crall )
Check your global git settings in SourceTree. There is a flag called "use rebase instead of merge by default for tracked branches"
Bildschirmfoto 2016-02-01 um 07.52.16.png
This will typically auto-enable the checkbox below in the pull dialog/popup:
Bildschirmfoto 2016-02-01 um 07.51.13.png
turn off if you want to auto-detecting best (git default merge without options).
turn on the field above if you want to force a merge point, this is typically what you want when you close feature branches.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot