parse_git_state() {
  BRANCH=$(parse_git_branch)

  if [ -z $BRANCH ]; then
    return
  fi

  LOCAL=$(git rev-parse @ 2>/dev/null)
  REMOTE=$(git rev-parse @{u} 2>/dev/null)
  BASE=$(git merge-base @ @{u} 2>/dev/null)
  STATE=""

  if [ -z "$REMOTE" -o "$LOCAL" = "$REMOTE" ]; then
      STATE=""
  elif [ "$LOCAL" = "$BASE" ]; then
      STATE=", pull"
  elif [ "$REMOTE = $BASE" ]; then
      STATE=", push"
  else
      STATE=", diverged"
  fi

  echo " ($BRANCH$STATE)"
}

PS1='\u@\h:\w$(parse_git_state)\$ '