replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0
replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0

erwinvaneijk/oh-my-zsh,erwinvaneijk/oh-my-zsh