git: Added alias for pulling from upstream while preferring own commits