If update method is set to 'rebase', be consistent and avoid creating merge commits by doing a rebase against the update branch first
Change default update method to rebase (this isn't very git-like, but it makes more sense for Liferay workflows)