[Nix-dev] force-push to master

[Domen Kožar]

IRC history (which is not reliable) shows that the only commit missing in
master is

nixpkgs/master 5729457 Vladimír Čunát: Merge: remove poppler_0_18 from
libreoffice

My reflog can not know about commits on master since I didn't rebase them.
Vladimir: could you recommit that change?

***

How it happened: I was working on another machine and push.default was set
to "matching". When I pushed an force-push update to a branch (PR), it also
force-pushed the master.


On Sun, Mar 9, 2014 at 1:45 PM, Bjørn Forsman <bjorn.forsman at gmail.com>wrote:

> On 9 March 2014 13:37, Domen Kožar <domen at dev.si> wrote:
> > Hi all,
> >
> > I managed to force-push master and delete a couple of commits. I have no
> > idea how that happened, but let's first fix the mess. Does anyone commit
> >
> > nixpkgs/master 6cfbc75 Michael Raskin: Fix CL-Launch source link
> >
> > If so, please force-push it to master (check before that if any new
> commits
> > are there since "fa7ef9c pythonPackages.sqlalchemy9: add"
> >
> > I apologize for inconveniences. Domen
>
> There is always "git reflog". You can roll-back your branch locally,
> and when you think you've got it right, force push to upstream.
>
> Btw, I just pushed two commits:
>
> 2014-03-09 13:35 Bjørn Forsman      o [master] [origin/HEAD]
> [origin/master] Revert "Update BadVPN"
> 2014-03-09 13:23 Bjørn Forsman      o can-utils: new package
>
> But I can put them back in if you force push them away.
>
> Best regards,
> Bjørn Forsman
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.science.uu.nl/pipermail/nix-dev/attachments/20140309/c99cda6c/attachment.html