Received: from magus.postgresql.org (magus.postgresql.org [87.238.57.229]) by mail.postgresql.org (Postfix) with ESMTP id 4E1F52EE4E4; Fri, 13 Jan 2012 12:06:13 -0400 (AST) Received: from 30.55.colo.spiretech.net ([69.168.55.30] helo=lists.commandprompt.com) by magus.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1Rljdp-0003L0-Ts; Fri, 13 Jan 2012 16:06:12 +0000 Received: from perhan.alvh.no-ip.org (spinlock.commandprompt.com [69.168.55.30]) by lists.commandprompt.com (Postfix) with ESMTPA id B3694EF; Fri, 13 Jan 2012 08:06:13 -0800 (PST) Received: from perhan.alvh.no-ip.org ([190.95.26.35] helo=perhan.alvh.no-ip.org) by assp.commandprompt.com with ESMTPS(AES256-SHA) (2.1.1); 13 Jan 2012 08:06:11 -0800 Received: by perhan.alvh.no-ip.org (Postfix, from userid 1000) id 558116E543; Fri, 13 Jan 2012 13:05:51 -0300 (CLST) Content-Type: text/plain; charset=UTF-8 Cc: Simon Riggs , Magnus Hagander , Dave Page , Robert Haas , Pg Committers Subject: Re: pgsql: Typo fix. From: Alvaro Herrera To: Andrew Dunstan In-reply-to: <4F1052A6.40600@dunslane.net> References: <4F1052A6.40600@dunslane.net> Date: Fri, 13 Jan 2012 13:05:51 -0300 Message-Id: <1326470664-sup-9639@alvh.no-ip.org> User-Agent: Sup/git X-Assp-Version: 2.1.1(11278) on assp.commandprompt.com X-Assp-Client-TLS: yes X-Assp-ID: assp.commandprompt.com m1-70773-11593 X-Assp-Envelope-From: alvherre@alvh.no-ip.org X-Assp-Intended-For: simon@2ndquadrant.com X-Assp-Original-Subject: Re: [COMMITTERS] pgsql: Typo fix. Content-Transfer-Encoding: quoted-printable X-Pg-Spam-Score: -1.9 (-) X-Archive-Number: 201201/112 X-Sequence-Number: 47069 Excerpts from Andrew Dunstan's message of vie ene 13 12:49:58 -0300 2012: >=20 > On 01/13/2012 10:22 AM, Simon Riggs wrote: > > On Fri, Jan 13, 2012 at 2:26 PM, Magnus Hagander= wrote: > > > >> Just FWIW, I use a separate development repository as well. But I ha= ve > >> it added as a remote from the "commit repository", and thus just do = a > >> "git merge --squash" instead of manually moving them with "patch". > >> > >> But I am very much a fan of keeping the repos separate for just that > >> reason - don't want to accidentally commit dev code. > > OK thanks. > > > > My patch foo seems occasionally faulty, but git merge --disaster is > > something I'm happy to avoid. I'll work on my hand grenade juggling > > skills before I do that. >=20 >=20 > How you work is up to you, but "git merge --squash" is pretty safe,=20 > since it doesn't actually commit anything. And if things go wrong you can always do git merge --abort. I, too, used to be scared of some of the options that git gives us, but after experimentation I found some of them to be hugely useful and safe enough that I now very rarely run use patches anymore. --=20 =C3=81lvaro Herrera The PostgreSQL Company - Command Prompt, Inc. PostgreSQL Replication, Consulting, Custom Development, 24x7 support