Is there a way to achieve fast-forward merge in SourceTree?

[Jirong Hu]

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.

Thanks

Jirong

st.png

[childnode · Accepted solution]

(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.

Bildschirmfoto 2016-02-01 um 07.52.16.png

Bildschirmfoto 2016-02-01 um 07.51.13.png

[Jirong Hu]

The following options will do the job:

st.png

[Tim Crall]

Check your "Git" settings in SourceTree and make sure "Do not fast-forward when merging, always create a commit" is not checked.

Screen Shot 2016-01-29 at 11.11.34 AM.png

Screen Shot 2016-01-29 at 11.11.34 AM.png

[Jirong Hu]

It is not checked. So uncheck this option only doesn't do the job.