From: Edmundo Carmona Antoranz Date: Mon, 29 Jul 2019 14:05:57 GMT Subject: Re: [PATCH v3] builtin/merge: support --squash --commit Message-ID: In-Reply-To: <20190719053952.13516-1-eantoranz@gmail.com> On Thu, Jul 18, 2019 at 11:40 PM Edmundo Carmona Antoranz wrote: > > Using --squash made git stop regardless of conflicts so that the > user could finish the operation with a later call to git-commit. > > Now --squash --commit allows for the operation to finish with the > new revision if there are no conflicts. If the user does not use > --commit, then --no-commit is used as default so that it doesn't > break previous git behavior. > What should I do to get this patch to move forward? Either get comments (as the previous versions did... thanks, Junio!) or be accepted? Given that I didn't get a feedback I thought that it had made it (always the optimistic) but I see that it's not in Junio's 'what's cooking' mail from friday so I think it's fair to assume that this version of the patch is not gonna fly. Thanks in advance!