How to merge branches with --no-ff flag using SourceTree?

Browsed the knowledge base, read documentation, tried to find such option in the application, but without success.
I need to merge branches with no fast forward option. Please help me to avoid using console every time I have to merge them )

4 answers

1 accepted

Preferences for git has an option

"Do not fast forward when merging, always create commit"

This is what I'm looking for! It's so sad that I cannot give you an 'answer' point.

You can accept multiple answers.

Another me sees this option -) I asked from my personal account, but then continued with my company one. But the answer is still can be assigned only to a single coment.

In the old Answers it was possible to accept two answers, maybe not in the new one.

In the "Confirm merge" dialog, there is a checkbox: "Create a new commit even if fast-forward is possible". If you leave this unchecked, it uses --no-ff.

I think you mean, "if you check this". Unchecked = "FF if possible", Checked = "Never FF".

Thank you friends, but there is no such option on the 'Confirm' dialog in Mac OS X version (1.9.5).

There are only 'Commit...' and 'Include messages...' check boxes there.

Yes, you are right. Checked => -no-ff

Another possibility (if this is really missing form the Mac version) is to create a custom action to do this.

Oh! I've really missed it! This might help. Thank you.

They still don't seem to have this in mac version.

This script works as custom action:

#!/bin/bash

branch_name=$(egrep -lir $1 .git/refs/heads/feature/* |head -1|sed -e 's/.git\/refs\/heads\///')

git merge $branch_name --no-ff --no-edit

If you have multiple branches at that commit, behavior is uncertain.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

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

274 views 0 3
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot