From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Fri, 05 Jul 2019 17:01:33 GMT
Subject: Re: [RFC/PATCH v1] merge - make squash a 1-step operation
Message-ID: <CAOc6etYRSRJm34X1=x7nh6PyhypF3nTvKSqzDhDCzOrNXyZkQw@mail.gmail.com>
In-Reply-To: <20190705165624.22243-1-eantoranz@gmail.com>

On Fri, Jul 5, 2019 at 10:56 AM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
>
> ---
>  builtin/merge.c | 63 +++++++++++++++++++++++++------------------------
>  1 file changed, 32 insertions(+), 31 deletions(-)
>

This would be a first step in order to achieve the dream of having
rebase/squash in a single step. Let the flame-fest begin. I'm
wondering if it makes sense to support -m with squash or if we should
keep the default message with all the revisions that are being
squashed (perhaps erroring out if the user mixes --squash and -m, just
like mixing --squash and --no-ff)

Thanks in advance for your feedback.