# Suitable for inclusion in your .bash_profile or similar
up () {
  local branch=$(git rev-parse --abbrev-ref HEAD)
  git checkout master
  git pull upstream master && git push origin master
  git checkout "$branch"
}