The usual new options and option values.
The first commit (5d0920c0) included some problematic lines caused by a failed git stash use. These were removed in the second commit (7e260702). Sorry for the noise.
git stash