From: | Robert Haas <robertmhaas(at)gmail(dot)com> |
---|---|
To: | Bruce Momjian <bruce(at)momjian(dot)us> |
Cc: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, Greg Smith <greg(at)2ndquadrant(dot)com>, pgsql-hackers(at)postgresql(dot)org |
Subject: | Re: Creating new remote branch in git? |
Date: | 2011-06-13 01:07:05 |
Message-ID: | BANLkTikJ2O_P+j0Zc8H9uqyrojccGA9t_w@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-hackers |
On Sun, Jun 12, 2011 at 7:59 PM, Bruce Momjian <bruce(at)momjian(dot)us> wrote:
> Tom Lane wrote:
>> Bruce Momjian <bruce(at)momjian(dot)us> writes:
>> > Did the system create the .git/config '[branch "REL9_1_STABLE"]' section
>> > for you or did you create it manually?
>>
>> git created them for me. I did no config hacking whatever, but now
>> I have:
>>
>> [branch "REL9_1_STABLE"]
>> remote = origin
>> merge = refs/heads/REL9_1_STABLE
>> rebase = true
>>
>> which exactly parallels the pre-existing entries for the other branches.
>>
>> One point that might affect this is that in ~/.gitconfig I have
>>
>> [branch]
>> autosetuprebase = always
>>
>> which is as per the setup recommendations on the wiki page.
>
> I have the same in my ~/.gitconfig:
>
> [branch]
> autosetuprebase = always
>
> I am attaching my ~/.gitconfig.
>
> Do I need to run this in every branch?
>
> git config branch.master.rebase true
>
> Right now our wiki only says to run it in the master branch. I am
> attaching my postgresql/.git/config file too.
This is ironclad evidence that you followed the directions out of
order, but yes, running that for every branch will fix it.
--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
From | Date | Subject | |
---|---|---|---|
Next Message | Noah Misch | 2011-06-13 01:23:26 | Re: Make relation_openrv atomic wrt DDL |
Previous Message | Robert Haas | 2011-06-13 01:06:02 | Re: lazy vxid locks, v1 |