From: | Robert Haas <robertmhaas(at)gmail(dot)com> |
---|---|
To: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
Cc: | pgsql-committers(at)postgresql(dot)org |
Subject: | Re: pgsql: Ooops, no DATE_IS_NOBEGIN/DATE_IS_NOEND in 8.3 or 8.2 ... |
Date: | 2010-12-29 04:56:09 |
Message-ID: | AANLkTimR-6g1yx94PykQPcjXJO5T2hmYFLtsdghvUPgQ@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
On Tue, Dec 28, 2010 at 11:50 PM, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> Robert Haas <robertmhaas(at)gmail(dot)com> writes:
>> On Tue, Dec 28, 2010 at 11:02 PM, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
>>> I heard the siren call of git cherry-pick, but should have lashed myself
>>> to the mast.
>
>> Applying the same patch blindly to every branch can bite you no matter
>> how you move the patch around.
>
> Sure. But git cherry-pick encourages you to commit first and test
> later, which is how come I ended up with a commit I couldn't undo.
> Think I'll use -n in future.
Well, you *can* undo it quite easily, as long as you haven't pushed
it. git reset --hard origin/master, git commit --amend, git rebase -i
origin/master, etc.
--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
From | Date | Subject | |
---|---|---|---|
Next Message | Andrew Dunstan | 2010-12-29 05:01:05 | Re: pgsql: Ooops, no DATE_IS_NOBEGIN/DATE_IS_NOEND in 8.3 or 8.2 ... |
Previous Message | Tom Lane | 2010-12-29 04:50:10 | Re: pgsql: Ooops, no DATE_IS_NOBEGIN/DATE_IS_NOEND in 8.3 or 8.2 ... |