From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Sat, 16 Jan 2010 22:28:17 GMT
Subject: Re: [PATCH v2] Add push --set-upstream
Message-ID: <20100117072817.6117@nanako3.lavabit.com>
In-Reply-To: <be6fef0d1001152055j2f178ecifc8e0265446ab75f@mail.gmail.com>

Quoting Tay Ray Chuan <rctay89@gmail.com>

> Hi,
>
> On Sat, Jan 16, 2010 at 12:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> Tay Ray Chuan <rctay89@gmail.com> writes:
>>>
>>>> After all, there's already the config called branch.autosetupmerge and
>>>> branch.autosetuprebase.
>>>
>>> Do you mean Ilari's patch already sets up branch.name.rebase for people
>>> with branch.autosetuprebase true?
>>
>> I checked; the patch uses install_branch_config() so it should get this
>> right automatically.
>
> ok, then ignore my suggestion about --setup-merge and --setup-rebase.
>
> I guess Nanako's query about 'pull --rebase' is settled as well.

I have branch.autosetuprebase so 'git push -u' is good enough for me.
Thanks.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/