[firedrake] Unwise rebase

Dear firedrake, I just realised that I made a stupid mistake and rebased the PyOP2 performance-logging branch (which is racking a remote branch) on master. After syncing with the remote I end up with two sets of commits in my branch. Is there a safe way of fixing this or do I just have to live with the confusing history now? Sorry! Eike