Pep Guardiola has signed a new two-year deal at Manchester City, extending his stay at the club until the summer of 2025.