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

Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts

From
Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date
Jul 14, 2019, 07:15 UTC
Message-ID
<CAOc6eta-jX93k6twcrJOeRt+JHtLk4mUs7YD_bG=Ggvw4thAZQ@mail.gmail.com>
In-Reply-To
<20190713051804.12893-1-eantoranz@gmail.com>

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

>
> Option -m can be used to defined the message for the revision instead
> of the default message that contains all squashed revisions info.
>
I have noticed that just adding the support for -m in squash is more
complex than this patch is reaching so I think I will break this patch
into two parts:
- squash in a shot if there are no conflicts
- support -m with squash
Disregard this patch, please.
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 7 in “builtin/merge: allow --squash to commit if there are no conflicts”
  1. builtin/merge: allow --squash to commit if there are no conflictsEdmundo Carmona Antoranz, Jul 13, 2019
  2. Edmundo Carmona AntoranzJul 13, 2019
  3. Junio C HamanoJul 14, 2019
  4. Edmundo Carmona AntoranzJul 14, 2019
  5. Junio C HamanoJul 17, 2019
  6. Edmundo Carmona AntoranzJul 18, 2019
  7. Edmundo Carmona AntoranzJul 18, 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.