Merge branch 'bf/explicit-config-set-in-advice-messages'

The advice messages now tell the newer 'git config set' command to
set the advice.token configuration variable to squelch a message.

* bf/explicit-config-set-in-advice-messages:
  advice: suggest using subcommand "git config set"

diff --cc commit.c
Simple merge

diff --cc hook.c
Simple merge

diff --cc object-name.c
Simple merge

diff --cc t/t0018-advice.sh
Simple merge

diff --cc t/t3200-branch.sh
Simple merge

diff --cc t/t3404-rebase-interactive.sh
Simple merge

diff --cc t/t3501-revert-cherry-pick.sh
Simple merge

diff --cc t/t3511-cherry-pick-x.sh
Simple merge

diff --cc t/t3602-rm-sparse-checkout.sh
Simple merge

diff --cc t/t3700-add.sh
Simple merge

diff --cc t/t7002-mv-sparse-checkout.sh
Simple merge

diff --cc t/t7004-tag.sh
Simple merge

diff --cc t/t7201-co.sh
Simple merge

diff --cc t/t7508-status.sh
Simple merge