Received: from magus.postgresql.org (magus.postgresql.org [87.238.57.229]) by mail.postgresql.org (Postfix) with ESMTP id D06942EE4E4; Fri, 13 Jan 2012 11:50:29 -0400 (AST) Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by magus.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1RljOc-00031b-FH; Fri, 13 Jan 2012 15:50:28 +0000 X-Originating-IP: 217.70.178.144 Received: from mfilter16-d.gandi.net (mfilter16-d.gandi.net [217.70.178.144]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id A8D2CA807E; Fri, 13 Jan 2012 16:50:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by mfilter16-d.gandi.net (mfilter16-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id TOLvqkNdGaQ9; Fri, 13 Jan 2012 16:50:01 +0100 (CET) X-Originating-IP: 98.27.54.176 Received: from [192.168.10.146] (cpe-098-027-054-176.nc.res.rr.com [98.27.54.176]) (Authenticated sender: adsend@dunslane.net) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 77216A8089; Fri, 13 Jan 2012 16:49:59 +0100 (CET) Message-ID: <4F1052A6.40600@dunslane.net> Date: Fri, 13 Jan 2012 10:49:58 -0500 From: Andrew Dunstan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: Simon Riggs CC: Magnus Hagander , Dave Page , Robert Haas , pgsql-committers@postgresql.org Subject: Re: pgsql: Typo fix. References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Pg-Spam-Score: -1.9 (-) X-Archive-Number: 201201/111 X-Sequence-Number: 47068 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 have >> 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. How you work is up to you, but "git merge --squash" is pretty safe, since it doesn't actually commit anything. cheers andrew