Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:68538 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 48850 invoked from network); 15 Aug 2013 18:46:18 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Aug 2013 18:46:18 -0000 Authentication-Results: pb1.pair.com header.from=johannes@schlueters.de; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=johannes@schlueters.de; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain schlueters.de from 217.114.211.66 cause and error) X-PHP-List-Original-Sender: johannes@schlueters.de X-Host-Fingerprint: 217.114.211.66 config.schlueters.de Received: from [217.114.211.66] ([217.114.211.66:56213] helo=config.schlueters.de) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A5/48-06453-9F12D025 for ; Thu, 15 Aug 2013 14:46:18 -0400 Received: from [192.168.2.20] (ppp-88-217-94-43.dynamic.mnet-online.de [88.217.94.43]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by config.schlueters.de (Postfix) with ESMTPSA id D24846CA37; Thu, 15 Aug 2013 20:46:14 +0200 (CEST) To: Jordi Boggiano Cc: internals@lists.php.net In-Reply-To: <520D1BA8.1060504@seld.be> References: <1376589335.14536.228.camel@guybrush> <520D1BA8.1060504@seld.be> Content-Type: text/plain; charset="UTF-8" Date: Thu, 15 Aug 2013 20:45:56 +0200 Message-ID: <1376592356.14536.240.camel@guybrush> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] git branches 5.3/ 5.4 / 5.5 From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=) On Thu, 2013-08-15 at 20:19 +0200, Jordi Boggiano wrote: > > And to ensure you never push garbage by accident, run this to tell git > to always only push the branch you're on when you run `git push`: > > git config --global push.default current Good tip. I wasn't aware of that setting. Mind that we have multiple active branches we typically push to in one go, so using the default and being clear about ones tracking branches can be comfortable, too, and avoid forgetting to properly push to all branches. So each approach has benefits and downsides ... and well as I'm the only one who currently can do forced pushes (I think) neither approach will cause actual trouble ;-) (if it becomes bad, which I don't expect, we can add restrictions to the server, too) Probably the best is to do a push --dry-run to check and getting used to manually specify branches i.e. git push origin PHP-5.4 PHP-5.5 master johannes