Re: [PATCH] Add support for merging from upstream by default.

From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Feb 7, 2011, 09:43 UTC
Message-ID: <AANLkTim7hRrGtT_9dsHWp-405H_RF1s=UUQ6BPFCOY+n@mail.gmail.com>
In-Reply-To: <AANLkTikii-fx5nYeBDc70eh_wj05sEZ6fH6=bF9GqHBK@mail.gmail.com>

On Mon, Feb 7, 2011 at 10:36, Bert Wesarg <bert.wesarg@googlemail.com> wrote:

Show 6 quoted lines

> On Sat, Feb 5, 2011 at 14:31, Jared Hance <jaredhance@gmail.com> wrote:
>> Adds the option merge.defaultupstream to add support for merging from the
>> upstream branch by default. The upstream branch is found using
>> branch.[name].upstream.
>
> Why do we need a per branch config for this, isn't .origin/.merge

Why do we need a *new* per branch config for this, isn't .origin/.merge

Show 5 quoted lines

> enough? Or, where is the connection between your new .upstream and the
> @{upstream} ref?
>
> Bert
>