I think it is better to do it only at release time. All merge does not need to be included in the changelog.