Aha!

git config --global push.default tracking

That's what I've been looking for! Why didn't I guess that? And there's more where that came from, too.