On 2017-09-14 18:16:03 +0000 (+0000), Jeremy Stanley wrote: > On 2017-09-14 12:01:54 -0600 (-0600), Matt Riedemann wrote: > [...] > > I figured out the pattern when this happens to change the author. > > > > 1. git review -d > > 2. git rebase -i master > > 3. <merge conflict> > > 4. fix merge conflict > > 5. git add <files> > > 6. git commit > > 7. git rebase --continue > > > > It's the merge conflict + git commit during the rebase that changes the > > author for me. > > You ought to be able to completely skip #6 above. Continuing the > rebase (at least in the releases of Git I use) will amend the commit > correctly and give you the ability to adjust the commit message when > it does so.
Also, I'll just put this here...
https://docs.openstack.org/infra/manual/developers.html#rebasing-a-commit
--
Jeremy Stanley
signature.asc
Description: Digital signature
__________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
