On 9 March 2014 13:37, Domen Kožar <[email protected]> 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
A few minutes ago I did this: $ git pull --rebase remote: Counting objects: 12, done. remote: Compressing objects: 100% (12/12), done. remote: Total 12 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (12/12), done. From https://github.com/NixOS/nixpkgs + 5729457...fa7ef9c master -> origin/master (forced update) + c5fbbd4...4434040 modernize_nixos_generate_config -> origin/modernize_nixos_generate_config (forced update) + c5fbbd4...4434040 refs/pull/1900/head -> origin/pr/1900 (forced update) First, rewinding head to replay your work on top of it... Above you can see the commit hashes that origin/master moved between. Your tree should still have those same commit hashes / ids (assuming you didn't "git gc" just now :-) ) _______________________________________________ nix-dev mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-dev
