Ups forgot the -s for signing: git commit -s --amend or git commit -a -s --amend (if you didn't use git delete)
On Tuesday, 1 October 2019 01:56:29 UTC+2, Michael Brown wrote: > > No problem be patient until "someone" has merged the first PR > Then All you have to do afterwards is following: handy to learn exercise : > > First make sure you have your new work on a branch: > > git checkout -b pin-work > > then: > Syncing your fork > https://help.github.com/en/articles/configuring-a-remote-for-a-fork > https://help.github.com/en/articles/syncing-a-fork > > this leaves you on your master branch and you should see the newly merged > commit doing a > git log > --> (press q to get out) > > then you do a rebase to place your work branch on top of my PR (at this > point in the upstream machinekit mksocfpga repo) > > git checkout pin-work > git rebase master > > next you then make sure you have the new pin file and you delete the > obsoleted one. > git rm <old pinfile name> > > then you update and sign the commit > > git commit --amend or git commit -a --amend (if you didn't use git > delete) > > then you commit is ready again for PR ... :-) > Michael B -- website: http://www.machinekit.io blog: http://blog.machinekit.io github: https://github.com/machinekit --- You received this message because you are subscribed to the Google Groups "Machinekit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/machinekit/35709ae2-bcbf-4b71-b566-633ce49aba06%40googlegroups.com.
