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

Re: Custom merge driver with no rename detection

From
FAFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Date
Feb 15, 2016, 10:42 UTC
Message-ID
<CALMa68p9jdO63k2NLTUJXyms=Fc+woXx00UXCxzJ5_zV8jO8Rw@mail.gmail.com>
In-Reply-To
<alpine.DEB.2.20.1602150858340.2964@virtualbox>

On 15 February 2016 at 06:06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 11 quoted lines
> Hi Felipe,
>
> On Sun, 14 Feb 2016, Felipe Gonçalves Assis wrote:
>
>> Attached is a quick and dirty patch that emulates the effect by
>> allowing greater than 100% rename thresholds to mean "no-renames".
>
> It is really hard to comment on attached patches.
>
> First comment: the commit message is awfully empty, and lacks a sign-off.
>

Thanks. I am sorry for not submitting the patch separately in an email, but, it was really not meant for serious review, just for emulating the desired effect with minimal effort.

However, if you do find this approach acceptable/desirable (rename-threshold > 100%), I can work on the issues pointed out and propose a proper patch.

Regards, Felipe

Previous: Johannes SchindelinNext: Junio C Hamano
Message 6 of 8 in “Custom merge driver with no rename detection”
  1. Felipe Gonçalves AssisFeb 14, 2016
  2. Junio C HamanoFeb 15, 2016
  3. Johannes SchindelinFeb 15, 2016
  4. Junio C HamanoFeb 15, 2016
  5. Johannes SchindelinFeb 15, 2016
  6. Felipe Gonçalves AssisFeb 15, 2016
  7. Junio C HamanoFeb 15, 2016
  8. Felipe Gonçalves AssisFeb 16, 2016

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.