git workflow using rebase