merge --no-edit: do not credit people involved in the side branch