On 2014-05-02 17:12, Felipe Contreras wrote:
> Richard Hansen wrote:
>> Should branch.autosetuprebase be replaced with a new
>> branch.autosetupmode setting?
>
> Maybe. But if so, I think that should be done in another series.
> Otherwise we'll never have a chance to change anything.
Sure.
>>>
Richard Hansen wrote:
> On 2014-05-01 20:00, Felipe Contreras wrote:
> > Also 'branch..rebase' to 'branch..pullmode'.
> >
> > This way we can add more modes and the default can be something else,
> > namely it can be set to merge-ff-only, so eventually we can reject
> > non-fast-forward merges by
On 2014-05-01 20:00, Felipe Contreras wrote:
> Also 'branch..rebase' to 'branch..pullmode'.
>
> This way we can add more modes and the default can be something else,
> namely it can be set to merge-ff-only, so eventually we can reject
> non-fast-forward merges by default.
>
> The old configuratio
On Thu, May 01, 2014 at 07:00:02PM -0500, Felipe Contreras wrote:
> Also 'branch..rebase' to 'branch..pullmode'.
Perhaps this has already been hashed out in a previous version of this
series, but we may want to use pull.update and branch..update to
match the existing submodule..update. Both setti
Also 'branch..rebase' to 'branch..pullmode'.
This way we can add more modes and the default can be something else,
namely it can be set to merge-ff-only, so eventually we can reject
non-fast-forward merges by default.
The old configurations still work, but get deprecated.
Signed-off-by: Felipe C
5 matches
Mail list logo
