All changes

Committing all changes at once.