Merge branch 'ah/advise-force-pushing'

Help newbies by suggesting that there are cases where force-pushing
is a valid and sensible thing to update a branch at a remote
repository, rather than reconciling with merge/rebase.

* ah/advise-force-pushing:
  push: don't imply that integration is always required before pushing
  remote: don't imply that integration is always required before pushing
  wt-status: don't show divergence advice when committing

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc wt-status.c
Simple merge