Keep a Changelog
Do not keep a ChangeLog; it is redundant w.r.t. your git commit messages and causes useless merge conflicts when you cherry pick, rebase, etc.<p>Do use ChangeLog format for commit messages!