modified: updated git rebase guide