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

This widget could not be displayed.

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.

This widget could not be displayed.

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

This widget could not be displayed.

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.

This widget could not be displayed.

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 Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

722 views 1 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