okay. The additional work leading up to ccfd2c and 707443 shouldn't go to waste - you should either push them as 'better-written-branches, or just including the listing, in 'git log' form, or better still, in 'git whatchanged' form, among the documentation.
I hope you learned a few interesting things about git on the way - being able to recover 'lost commits' could be a useful skill; also gain some understanding of the use of sha1 checksum to identify commits and their integrity/security implications. ------------------------------ On Sun, Aug 17, 2014 09:22 BST ahi wrote: >Head should now be at a8afe54 > > >On Sun, Aug 17, 2014 at 11:08 AM, Hin-Tak Leung <[email protected] >> wrote: > >> >> You have made a mistake some where - as well as tried to change things >> while you restore. You seem to have restored the code to a9c4423 instead of >> a8afe54, as well as tried to modify a9c4423, so your current head is >> 707443... your head should be restored to a8afe54, or decendent of it, not >> anything else. What additional change did you try to make while restoring? >> a restore is a restore, do not try to make restore=somethingelse. If you >> need to make further changes, then that's further commits. >> >> =================== >> okay, as far as I see, you haven't been using rebase much until recently, >> so there are only two possible restoring points -a8afe54 or a9c4423 . Both >> of them satisfy "git log a8afe54..dc1796075ba452c8e92df5fa252aaaaf91bd >> 0f9b" and "git log a9c4423..dc1796075ba452c8e92df5fa252aaaaf91b d0f9b" >> shows nothing. >> ========================= >> >> >> >> ------------------------------ >> On Sun, Aug 17, 2014 08:31 BST ahi wrote: >> >> >The repo should now be restored to it's previous state. >> >git log HEAD..dc1796075ba452c8e92df5fa252aaaaf91bd0f9b >> >shows nothing. >> > >> > >> >-- >> >Best Regards, >> >Ahmed >> >> > > >-- >Best Regards, >Ahmed _______________________________________________ Spdx-tech mailing list [email protected] https://lists.spdx.org/mailman/listinfo/spdx-tech
