How can I make pull do a "git pull --rebase -p" by default... i.e. specify the -p flag after selecting the rebase by default option.

I've changed my settings to do a rebase instead of a merge when pulling, however it seems a lot safer to me to also use the "-p" flag. Can this be added so that it's the default for a merge? If not, how might I add this myself? Thanks!

1 answer

1 accepted

According to the git manual, the -p option (--preserve-merges) to rebase is only usable in interactive mode: http://linux.die.net/man/1/git-rebase. Therefore it's not really usable from SourceTree. It might be safer for you to not use the rebase option by default if you have merges you want to preserve.

Thanks! Makes sense.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

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

548 views 1 2
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