I agree, we should fix this. The attached patch is my attempt to do so, removing ChangeLog-specific parts and keeping other parts as a guide for commit messages.
Remove Changelog section from doc/contributing.rdoc [ci skip]
Replace it with a section on commit message formatting. Also,
move the section on rebasing to the bottom, since that only
applies to committers and not most contributors.