On Sun, Jun 12, 2011 at 7:59 PM, Bruce Momjian <bruce@momjian.us> wrote:
> Tom Lane wrote:
>> Bruce Momjian <bruce@momjian.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
