Allow choosing between merge and rebase when syncing#28

Allow to choose which method to use when syncing feature branches: merge or rebase.

When using ‘git rebase master’ command in feature branch instead of ‘git merge master’, we’ll get a linear history in feature branch, which is widely used in development, and considered a better way than lot of merging.