rebase will give you linear history, merge doesn't provide you that