On Fri, Jul 5, 2019 at 10:56 AM Edmundo Carmona Antoranz <[email protected]> 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.
