if you have the old history you can cherry pick it but guess we want to enforce the consistency with master instead of ensure 1.7 and 7.x forks - was actually one of the goal of the initial commit.
Romain Manni-Bucau @rmannibucau <https://twitter.com/rmannibucau> | Blog <https://blog-rmannibucau.rhcloud.com> | Old Blog <http://rmannibucau.wordpress.com> | Github <https://github.com/rmannibucau> | LinkedIn <https://www.linkedin.com/in/rmannibucau> | JavaEE Factory <https://javaeefactory-rmannibucau.rhcloud.com> 2016-12-05 19:26 GMT+01:00 David Blevins <[email protected]>: > Is there a way to get the commit back? > > > -- > David Blevins > http://twitter.com/dblevins > http://www.tomitribe.com > > > On Dec 5, 2016, at 5:13 AM, Romain Manni-Bucau <[email protected]> > wrote: > > > > +1 > > > > note that if you have the history you can still get back the commits from > > their hash (but for this one i lost them and JL didnt have them but > wanted > > to fix 1.7.x branch asap) > > > > > > Romain Manni-Bucau > > @rmannibucau <https://twitter.com/rmannibucau> | Blog > > <https://blog-rmannibucau.rhcloud.com> | Old Blog > > <http://rmannibucau.wordpress.com> | Github <https://github.com/ > rmannibucau> | > > LinkedIn <https://www.linkedin.com/in/rmannibucau> | JavaEE Factory > > <https://javaeefactory-rmannibucau.rhcloud.com> > > > > 2016-12-05 14:06 GMT+01:00 Jonathan Gallimore < > [email protected]> > > : > > > >> Raising this to the top level, as opposed to being inside another > thread... > >> > >> We had have a git reset --hard HEAD^X issued against the tomee-1.7.x > >> branch. The upshot is that although the commits in question are in the > >> repository somewhere, they no longer show up in the history for that > >> branch. > >> > >> This appears to be a fix for a completely unintentional merge from > master, > >> but I think we should avoid resetting heads or deleting commits through > any > >> other means in the future. > >> > >> For reference, the discussion about this is here: > >> http://tomee-openejb.979440.n4.nabble.com/today-s-git- > >> commits-noise-td4680661.html > >> > >> Jon > >> > >
