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

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

From
Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date
Jul 5, 2019, 17:01 UTC
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:

Show 5 quoted lines
>
> ---
>  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.
Previous: Edmundo Carmona Antoranz
Message 2 of 2 in “merge - make squash a 1-step operation”
  1. merge - make squash a 1-step operationEdmundo Carmona Antoranz, Jul 5, 2019
  2. Edmundo Carmona AntoranzJul 5, 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.