Re: [PATCH v4] merge: refuse --commit with --squash

2019-05-28 Thread Junio C Hamano
Vishal Verma writes: > From: Vishal Verma > > Convert option_commit to tristate, representing the states of > 'default/untouched', 'enabled-by-cli', 'disabled-by-cli'. With this in > place, check whether option_commit was enabled by cli when squashing a > merge. If so, error out, as this is not

[PATCH v4] merge: refuse --commit with --squash

2019-05-24 Thread Vishal Verma
From: Vishal Verma Convert option_commit to tristate, representing the states of 'default/untouched', 'enabled-by-cli', 'disabled-by-cli'. With this in place, check whether option_commit was enabled by cli when squashing a merge. If so, error out, as this is not supported. Previously, when --squ