updated defaults as well as git pull statement to rebase on current branch