From: Philippe Blain Date: Fri, 13 Nov 2020 14:04:58 GMT Subject: Re: [PATCH v2 10/11] add -p: prefer color.diff.context over color.diff.plain Message-ID: <4A02D618-34EB-4B20-A102-99B3CDAFD0BB@gmail.com> In-Reply-To: <48d8e0badfec5f0e576868f7a406ed7ede6c7200.1605097704.git.gitgitgadget@gmail.com> Hi Dscho, > Le 11 nov. 2020 à 07:28, Johannes Schindelin via GitGitGadget a écrit : > > From: Johannes Schindelin > > This still needs s/needs/leads/ > to inconsistencies when both config names are used: the > initial diff will be colored by the diff machinery. Once edited by a > user, a hunk has to be re-colored by `git add -p`, though, which would > then use the other setting to color the context lines. Philippe.