Hi Doug, thanks for your answer. I just pushed a commit with the missing ChangeLogs as the less intrusive solution. To make sure that this doesn't happen again, I set up a pre-push script that will yell at me if I forget to include ChangeLogs or have any lines in the commit message that are not supposed to be there. Regards, Tim > -----Original Message----- > From: Doug Evans [mailto:xdje42@gmail.com] > Sent: Tuesday, February 14, 2017 5:22 PM > To: Wiederhake, Tim > Cc: gdb-patches@sourceware.org; Metzger, Markus T > ; palves@redhat.com > Subject: Re: [PATCH v6 0/9] Python bindings for btrace recordings > > On Tue, Feb 14, 2017 at 2:18 AM, Wiederhake, Tim > wrote: > > Hi all, > > > >> > Is this good to go? > >> LGTM > > > > ... And in return I made a mess. What should have been a "git push --dry- > run" to prepare for pushing this, ended up as an actual push. The commits > now miss the actual ChangeLog entries and contain some "Change-Id" lines. > Before I start fiddeling and probably make things worse, could you tell me > how to properly resolve this? > > > > Thanks, > > Tim > > Hi. > I suppose technically the Right thing to do is to revert it all and recommit with > the ChangeLog changes. > But it's not like we never make post-commit corrections to just ChangeLogs. > Perhaps not on this scale, but I'm totally ok with just ignoring the Change-Id > lines and adding the ChangeLog entries as a separate patch. Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Christian Lamprechter Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928 &j!z޶~ۙb֫rnr