Rule #1: - Commit ALL changes to HEAD. Rule #2: - Bugfixes in a release branch MUST be committed only when agreed to by Ingmar/Stucki. They are responsible for filtering only relevant fixes in there. Mostly, this means a) no new features, b) only CRITICAL bugfixes. Annoyancies does not belong there (imho).