[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 no

[PATCH v3] builtin/merges: clarify --squash behavior with --commit

2019-05-23 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 no

Re: [PATCH] Documentation/merge-options: clarify --squash behavior

2019-04-25 Thread Vishal Verma
On Thu, 2019-04-25 at 13:16 +0900, Junio C Hamano wrote: > > I think it is bad to silently ignore the option. With or without > this documentation update, I think it is sensible to update the code > so that it errors out when "--squash --commit" are both given at the > same time, just like when

[PATCH] Documentation/merge-options: clarify --squash behavior

2019-04-24 Thread Vishal Verma
ned-off-by: Vishal Verma --- There may be an argument to make --commit 'just work' with squash, but that might involve changing option_commit from OPT_BOOL to something that can distinguish between the default, what's requested on the command line, or the --no- version. Documentation/mer