On Tue, Apr 17, 2018 at 12:31 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote:
> On Mon, Apr 16, 2018 at 8:29 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> It seems that this
>>
>> $ git -c color.blame.repeatedlines=cyan blame --heated-lines builtin/blame.c
>>
>> refuses to run.
>>
>> Would it work if the configuration is in .git/config instead, or
>> would it forever disable --heated-lines once somebody choses to use
>> --color-lines feature by default by configuring it in?
>
> That is the unfortunate part of this series, I have not figured out how to
> treat these two options at the same time.
>
> One could take the approach to check the config first and see if there
> are conflicts and then overlay it with the command line options
> (and resolve conflicts there, but CLI taking precedence over config).
>
> Or we'd need to introduce another config
> blame.coloring={none, repeatedlines, highlightrecent}
> which breaks the tie.
Nevermind, we can overlay these color schemes just fine, which I'll do in
a resend.
