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

From: Philip Oakley <philipoakley@iee.email>
Date: Dec 21, 2019, 17:00 UTC
Message-ID: <7b60ce55-700e-0c67-76ac-a983991e49f2@iee.email>
In-Reply-To: <BZAQIE4YND2I.Z7BFCW7BLH3K@penguin>

Hi Tom,

On 21/12/2019 02:17, Tom Miller wrote:

Show 17 quoted lines

> 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