Updated git up to stash/unstash if necessary, and rebase if not starting on master