[Owncloud] Git fuckup ....big sorry

[Morris Jobke]

Hi Thomas,

I've just reverted the mentioned versions - thanks to git, which keeps
everything.

$ gp origin master
Counting objects: 1038, done.
Compressing objects: 100% (46/46), done.
Writing objects: 100% (484/484), 259.58 KiB, done.
Total 484 (delta 456), reused 464 (delta 436)
To git at github.com:owncloud/core.git
   17fe748..d1a39ab  master -> master

$ gp origin stable5
Counting objects: 93, done.
Compressing objects: 100% (28/28), done.
Writing objects: 100% (59/59), 6.47 KiB, done.
Total 59 (delta 38), reused 46 (delta 26)
To git at github.com:owncloud/core.git
   3b30bb2..f4e94a4  stable5 -> stable5

$ gp origin search_scrollto
Counting objects: 31, done.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (16/16), 1.68 KiB, done.
Total 16 (delta 10), reused 11 (delta 5)
To git at github.com:owncloud/core.git
   e99e0d7..32c57c5  search_scrollto -> search_scrollto




2013/8/5 Thomas Müller <thomas.mueller at tmit.eu>

> Morris,
>
> afaik it's looking good - I just wonder where that commit is comming from:
>
> https://github.com/owncloud/core/commit/f4e94a46cb7d25da899c460840d9327e2542af5e
>
> Looks like I fucked up history last night :-(
>
> Tom
>
> Am Montag, dem 05.08.2013 um 8:37 schrieb Morris Jobke:
> > Hi,
> >
> > I hopefully could recover the history(is already pushed), but be carefull
> > with the next pulls and pushes. Sorry for the inconvenience.
> >
> > Thanks,
> > Morris
> >
> >
> > 2013/8/5 Morris Jobke <morris.jobke at gmail.com>
> >
> > > Hi guys,
> > >
> > > I've done a big mistake ...I force a push, but not limited to my branch
> > >
> > > Can anybody restore following commits:
> > >
> > >  + d1a39ab...17fe748 master -> master (forced update)
> > >  + 32c57c5...e99e0d7 search_scrollto -> search_scrollto (forced update)
> > >  + f4e94a4...3b30bb2 stable5 -> stable5 (forced update)
> > >
> > > master: d1a39ab
> > > search_scrollto: 32c57c5
> > > stable5: f4e94a4
> > >
> > > Sorry -.-
> > >
> > > Morris
> > >
> _______________________________________________
> Owncloud mailing list
> Owncloud at kde.org
> https://mail.kde.org/mailman/listinfo/owncloud
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/owncloud/attachments/20130805/d9c33b5f/attachment.html>