Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`

From: Martin Ågren <martin.agren@gmail.com>
Date: Apr 24, 2018, 09:36 UTC
Message-ID: <CAN0heSqo43YkHa-1e7jaZqxktenonj3HZFrF=AKYR4+3ciZ2Sg@mail.gmail.com>
In-Reply-To: <CA+P7+xqP8b1i4-C242de2_P9dFsZ03pcRGo45scyfK2ohd-ykw@mail.gmail.com>

On 24 April 2018 at 08:20, Jacob Keller <jacob.keller@gmail.com> wrote:

> I'm guessing the diff algorithm simply found that this was a more
> compact representation of the change? It's a bit confusing when your
> description indicates you "moved" some code down, but it looks like
> you moved code up.

Agreed. I'll play with --anchored and other magic stuff to see if I can improve this. Or I could instead try to sell this patch as "move some other stuff out of the way" ;-) That seems a bit less direct though.

Thanks Martin

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