Magit has a concept of two remotes for every branch. It's a great way of tracking master with a feature branch: https://magit.vc/manual/magit/The-two-remotes.html