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!
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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs