From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Mon, 07 Feb 2011 09:36:05 GMT
Subject: Re: [PATCH] Add support for merging from upstream by default.
Message-ID: <AANLkTikii-fx5nYeBDc70eh_wj05sEZ6fH6=bF9GqHBK@mail.gmail.com>
In-Reply-To: <1296912681-4161-1-git-send-email-jaredhance@gmail.com>

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
enough? Or, where is the connection between your new .upstream and the
@{upstream} ref?

Bert