At 2018-12-11T23:13:00+0100, Bertrand Garrigues wrote: > On your local repo, you should be able to re-order the list of your > commits with: > > git rebase -i HEAD~<number of commits>
Yup, I've done an interactive rebase before. :) > and then moving the "pick xxxx" lines to place the wanted commit at the > bottom of the list. Of course if your 'no_more_makefile.comm.diff' > change depends on other change then you will have conficts to solve. They do. I just saved off all my commits and hard-reset my tree. I'll clean up the mess later. > If you're not sure about it you can still push all your changes on a > distinct branch, and I'll try to figure out how to merge this change on > master. Not necessary. I didn't want to hold anything up so I've already pushed the requested change. Regards, Branden
signature.asc
Description: PGP signature
