Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

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

From: Bert Wesarg <hidden>
Date: 2016-06-15 22:50:31

Possibly related (same subject, not in this thread)

On Mon, Feb 7, 2011 at 10:36, Bert Wesarg [off-list ref] wrote:
On Sat, Feb 5, 2011 at 14:31, Jared Hance [off-list ref] wrote:
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help