Hi Branden, On Mon, Dec 10 2018 at 05:55:10 PM, "G. Branden Robinson" <g.branden.robin...@gmail.com> wrote: > At 2018-12-10T23:24:50+0100, Bertrand Garrigues wrote: >> You can push no_more_makefile.comm.diff. As Peter has just modified the >> texinfo doc by refering to "Collection of Installation Directories" that >> you patch removes, could you please also update the texinfo doc? > > Hmm, I don't know if I can push just that fix given that it doesn't > apply cleanly. I don't know if git will let me and I don't know that > it's a good idea even if I can force it. > > I guess I can rewind my tree to origin, manually apply the patch, and > clean up the mess that results when I try to get back on my local HEAD. > > I'm happy to make a change to the Texinfo doc as well if I can figure > all this out.
On your local repo, you should be able to re-order the list of your commits with: git rebase -i HEAD~<number of commits> 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. 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. Regards, Bertrand
