Thanks to Wincent for describing how to get git to display this message. Basically it boils down to this:
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
Of course, if you’re working on a different branch, just use your branch name instead of master in all three places above.