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

Re: Propose promoting 'contrib/rerere-train.sh' to command

From
Philip Oakley <philipoakley@iee.email>
Date
Dec 21, 2019, 17:37 UTC
Message-ID
<8a84be21-e512-ac42-3426-524afb92ba9b@iee.email>
In-Reply-To
<7b60ce55-700e-0c67-76ac-a983991e49f2@iee.email>
On 21/12/2019 17:00, Philip Oakley wrote:
Show 31 quoted lines
> Hi Tom,
>
> On 21/12/2019 02:17, Tom Miller wrote:
>> I would like to propose promoting 'contrib/rerere-train.sh' to one of the
>> following:
>>
>>     1. A builtin c command 'builtin/rerere-train.c'
>>     2. To the top level directory as a built in script 'git-rerere-train.sh'
>>
>> I have recently found myself writing scripts using 'contrib/rerere-train.sh'
>> and I wish it was built into the command. This would make it easier to use
>> rather than having to find it on different platforms. I think it could also
>> benefit from some documentation.
>>
>> I am trying to gauge the interest in this change before spending some time on
>> working on it. I would also appreciate feedback or alternative approaches to
>> what I have suggested. Thank you for your time.
>>
>> Thanks,
>> Tom Miller
> This sounds like a useful capability (especially the documentation!).
>
> I also had aspirations that there should also be a way of exchanging the
> essence of the rerere data when conflicts (e.g. feature vs master branch
> merges) are known locally and ought to be communicable with the patch sets.
>
> see messages:
> <37ccaad0-40b4-ca63-e057-791119d7fa69@talktalk.net>
> <nycvar.QRO.7.76.6.1909261253400.15067@tvgsbejvaqbjf.bet>
>
> Philip

There is also audio of the section of the Virtual Conf in a personal email <20190914165929.GA22300@sigill.intra.peff.net> (~30MB) if needed.

Previous: Philip OakleyNext: Jeff King
Message 3 of 8 in “Propose promoting 'contrib/rerere-train.sh' to command”
  1. Tom MillerDec 21, 2019
  2. Philip OakleyDec 21, 2019
  3. Philip OakleyDec 21, 2019
  4. Jeff KingDec 21, 2019
  5. Junio C HamanoDec 21, 2019
  6. Jeff KingDec 22, 2019
  7. Tom MillerDec 22, 2019
  8. Johannes SchindelinJan 1, 2020

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.