Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:72693 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 46859 invoked from network); 19 Feb 2014 02:58:30 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 19 Feb 2014 02:58:30 -0000 Authentication-Results: pb1.pair.com header.from=rdlowrey@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=rdlowrey@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.223.170 as permitted sender) X-PHP-List-Original-Sender: rdlowrey@gmail.com X-Host-Fingerprint: 209.85.223.170 mail-ie0-f170.google.com Received: from [209.85.223.170] ([209.85.223.170:37464] helo=mail-ie0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 40/61-37047-5DD14035 for ; Tue, 18 Feb 2014 21:58:30 -0500 Received: by mail-ie0-f170.google.com with SMTP id rl12so1954287iec.15 for ; Tue, 18 Feb 2014 18:58:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=Ke1RXkl5qwSy9kcZexXOk4VTrG+2U6UgtHg1Tz359dk=; b=NWLDu2ArDLypqKosUpuTvtgfmoUepmwiO9dUySrVnhgwR6gdo8ZYQwb3ll/Q/TJaDD gpZC7EheWsPUtegxM4yfs17P8YC6YIhZDFzt+nNh2wAXYde0IEeQLMHcgf9IS1AyR0gu uPQI19Wq41Ex0iw4Kp2PMMtePk3iZ9sgyBIpv54HwgpXNMndhcCe/pk+KOEd9sW0aT0h sIovzphe+2TdDCkglrn8ktt+A0XMIAKTtx5uM46DG2fRTFc8oFDGO4MCkbgIsJMX5HzL 7yhzkEK7ghIq+jESbre4BvqW8ayZSd+lw0NGyaFAUgjSa3DVPC2Q4RhIyieq5PElE+oO eUIw== MIME-Version: 1.0 X-Received: by 10.42.16.199 with SMTP id q7mr10987790ica.16.1392778707479; Tue, 18 Feb 2014 18:58:27 -0800 (PST) Received: by 10.50.34.131 with HTTP; Tue, 18 Feb 2014 18:58:27 -0800 (PST) Date: Tue, 18 Feb 2014 21:58:27 -0500 Message-ID: To: "internals@lists.php.net" Content-Type: multipart/alternative; boundary=20cf303f66741c34d304f2b99089 Subject: Please fix my git screw up From: rdlowrey@gmail.com (Daniel Lowrey) --20cf303f66741c34d304f2b99089 Content-Type: text/plain; charset=ISO-8859-1 This is embarrassing ... So I made the mistake of git pull on each branch (5.4/5/6/master) (without --rebase) before pushing a small update tonight. So when I merged each branch the merge commits from my pulls went into each branch when I pushed. Basically I've spent a couple of hours trying to fix the problem with git revert but it's extremely tedious and I seem to have made the problem worse. Can someone with the appropriate karma please delete each of my commits on 5.4, 5.5, 5.6 and master from Feb 18, 2014? It has turned into a nightmare trying to fix this without rewriting history. Sorry -- it won't happen again :/ --20cf303f66741c34d304f2b99089--