git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3] builtin/merge: support --squash --commit

From
Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date
Jul 29, 2019, 14:05 UTC
Message-ID
<CAOc6etZaNG9gU89S491emSr7PHj9a+p+_0gNYT+BWcydadM+NA@mail.gmail.com>
In-Reply-To
<20190719053952.13516-1-eantoranz@gmail.com>

On Thu, Jul 18, 2019 at 11:40 PM Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote:

Show 9 quoted lines
>
> 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!
Previous: Edmundo Carmona Antoranz
Message 2 of 2 in “builtin/merge: support --squash --commit”
  1. builtin/merge: support --squash --commitEdmundo Carmona Antoranz, Jul 19, 2019
  2. Edmundo Carmona AntoranzJul 29, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.