Re: [PATCH 1/9] diff-merges: introduce --diff-merges=def

From: Sergey Organov <sorganov@gmail.com>
Date: Apr 8, 2021, 14:21 UTC
Message-ID: <87eefkdfho.fsf@osv.gnss.ru>
In-Reply-To: <f6b25ea6-88b1-c167-7fd4-440be8782fcb@iee.email>

Hi,

Philip Oakley <philipoakley@iee.email> writes:

Show 7 quoted lines

> Hi,
>
> On 07/04/2021 23:56, Sergey Organov wrote:
>> Introduce the notion of default diff format for merges, and the option
>> "def" to select it. The default is "separate" and can't yet be
> "def" feels a bit too short and sounds similar to "define" - why not
> spell out in full?

Dunno, it just happened. No sound reason. Will change to "default" for the next re-roll.

>> changed, so effectively "dev" is just a synonym for "separate" for
> did you mean "def"?  i.e. s/dev/def/   (..spell out in full ;-)

Yep, thanks!

-- Sergey

$ 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.