On Mon, Feb 7, 2011 at 10:36, Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx> wrote:
> On Sat, Feb 5, 2011 at 14:31, Jared Hance <jaredhance@xxxxxxxxx> 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
> enough? Or, where is the connection between your new .upstream and the
> @{upstream} ref?
>
> Bert
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html