Re: [RFC/PATCH v1] merge - make squash a 1-step operation

On Fri, Jul 5, 2019 at 10:56 AM Edmundo Carmona Antoranz 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 ste

[RFC/PATCH v1] merge - make squash a 1-step operation

--- builtin/merge.c | 63 + 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 6e99aead46..d5745a7888 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -64,6 +64,7 @@ static int option_edit = -