Merge "Explain a remote rejection of a non-fast-forward"