pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  

help / color / mirror / Atom feed
From: Andrew Dunstan <andrew@dunslane.net>
To: Simon Riggs <simon@2ndQuadrant.com>
Cc: Magnus Hagander <magnus@hagander.net>
Cc: Dave Page <dpage@pgadmin.org>
Cc: Robert Haas <rhaas@postgresql.org>
Cc: pgsql-committers@postgresql.org
Subject: Re: pgsql: Typo fix.
Date: Fri, 13 Jan 2012 10:49:58 -0500
Message-ID: <4F1052A6.40600@dunslane.net> (raw)
In-Reply-To: <CA+U5nM+Es=TC_88Edgpv7Pp4zstz6z-=7uEFU495sVVHnLkX-w@mail.gmail.com>
References: <E1Rlh5A-0003fw-6f@gemulon.postgresql.org>
	<CA+U5nM+TN6cZMkJ_+nTZHM4oXo06fa2NOoM+D2Dr=wy5w26xJQ@mail.gmail.com>
	<CA+OCxoxJw4ips6TNatDyasF9FhA4qVX=R7ndmMbVQ-KeZWOQBg@mail.gmail.com>
	<CA+U5nMLNLEJY+RHvfiWb3-Zu1reyZ44QEEWi6U3VwVbM7Sc8rQ@mail.gmail.com>
	<CABUevEy93JBPVAJ3gGC+4=Nq0471C6NxBT7mtFuZgNtRRBq5Lw@mail.gmail.com>
	<CA+U5nM+Es=TC_88Edgpv7Pp4zstz6z-=7uEFU495sVVHnLkX-w@mail.gmail.com>



On 01/13/2012 10:22 AM, Simon Riggs wrote:
> On Fri, Jan 13, 2012 at 2:26 PM, Magnus Hagander<magnus@hagander.net>  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



view thread (29+ messages)  latest in thread

Message-ID: <4F1052A6.40600@dunslane.net>
Permalink:  ../4F1052A6.40600@dunslane.net/
Also on:    postgresql.org/message-id/4F1052A6.40600@dunslane.net

 · 

reply
Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-committers@postgresql.org
  Cc: andrew@dunslane.net, simon@2ndQuadrant.com, magnus@hagander.net, dpage@pgadmin.org, rhaas@postgresql.org
  Subject: Re: pgsql: Typo fix.
  In-Reply-To: <4F1052A6.40600@dunslane.net>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox