Lars Schneider <[email protected]> writes:
>> On 25 Aug 2016, at 13:07, [email protected] wrote:
>>
>> From: Lars Schneider <[email protected]>
>>
>> The goal of this series is to avoid launching a new clean/smudge filter
>> process for each file that is filtered.
>>
>> A short summary about v1 to v5 can be found here:
>> https://git.github.io/rev_news/2016/08/17/edition-18/
>>
>> This series is also published on web:
>> https://github.com/larsxschneider/git/pull/10
>
> Hi Junio,
>
> I am working on v7 of this patch series and I noticed that is does
> not merge clean anymore (not even with git/git master). Should
> I rebase my patch series? If yes, what would be the most
> convenient base for you?
Depends on what you are conflicting with. I think you want to use
something that has at least 05d1ed61 ("mingw: ensure temporary file
handles are not inherited by child processes", 2016-08-22). Perhaps
2.10 final?
