Revert [git-llvm] Do not reinvent `@{upstream}`

This reverts r371290 (git commit 7faffd54)

The change wasnt NFC and broke some users' workflow. Reverting while figuring
out the best alternative to move forward.

llvm-svn: 371480