git-up script now uses current branch name for merging/rebasing with origin