Merge changes from 1.11.x.

src/ChangeLog

src/checkout.c

src/commit.c

src/diff.c

src/sanity.sh

src/update.c