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

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

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 v2] builtin/merges: clarify --squash behavior with --commit

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

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

que. I'll dig more into what allowing --commit actually means (as time allows) - I'm definitely a newbie with git internals, and indeed this is my first posting here. Thanks for the feedback! -Vishal

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

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