From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jan 2010 01:10:19 GMT
Subject: Re: [PATCH v2] Add push --set-upstream
Message-ID: <7vhbqmn9c4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <be6fef0d1001151653o7ba2cf7et8875eaf4333fc15a@mail.gmail.com>

Tay Ray Chuan <rctay89@gmail.com> writes:

> Hi,
>
> On Sat, Jan 16, 2010 at 8:06 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Nanako Shiraishi <nanako3@lavabit.com> writes:
>>
>>> Quoting Junio C Hamano <gitster@pobox.com>
>>>
>>>> Junio C Hamano <gitster@pobox.com> writes:
>>>>
>>>>>         # Ok let's do it for real.
>>>>>         git push    --track there this
>>>>
>>>> Ugh; s/--track/--set-upstream/, of course.
>>>
>>> How can I use this to say I want to use 'pull --rebase'?
>>
>> I dunno; "git push --set-upstream=rebase", perhaps?
>
> how about --setup-merge and --setup-rebase?
>
> 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?

If so, it might be better to keep "--set-upstream" as is, and have a way
to countermand that "autosetuprebase" default.