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

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

2019-04-24 Thread Junio C Hamano
Vishal Verma writes: > Add a note to the --squash option for git-merge to clarify its behavior > with respect to --commit. When --squash is supplied, 'option_commit' is > silently dropped. This can be surprising to a user who tries to override > the no-commit behavior of squash using --commit exp

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

2019-04-24 Thread Vishal Verma
Add a note to the --squash option for git-merge to clarify its behavior with respect to --commit. When --squash is supplied, 'option_commit' is silently dropped. This can be surprising to a user who tries to override the no-commit behavior of squash using --commit explicitly. Signed-off-by: Vishal