`git up` will do the right thing now, even if you are not on master