git bup: rebase current branch on origin/master
git mup: update master, fetching and trimming

Updates master with origin/master, and trims any now-merged local
branches.