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

Re: [PATCH 3/3] builtin-merge: add support for default merge options

From: Jay Soffian <hidden>
Date: 2016-06-15 22:46:21

On Fri, Mar 6, 2009 at 7:58 PM, Junio C Hamano [off-list ref] wrote:
I think it would be much better if you did not introduce a new
configuration merge.options which is not consistent with everything else
to begin with.

Instead, if your addition was literally to allow saying things like this,
it would be much easier to understand.

       [branch "*"]
               mergeoptions = ...
               remote = origin
               rebase = true
Okay. That's probably a more invasive patch, because a lot more code
paths look at [branch ...], but I'll look into it.
So overall, cumulative configuration tend to be more cumbersome for the
end user to manage.
Okay, you've convinced me.

j.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help