Kyle Meyer writes:
> Junio C Hamano writes:
>
>> Johannes Schindelin writes:
>
> [...]
>
- N_("color both diff and diff-between-diffs")),
+ N_("restrict coloring to outer diff markers")),
>>>
>>> How about "use simple diff colors" instead?
>
Hi Junio,
On Thu, 23 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Wed, 22 Aug 2018, Kyle Meyer wrote:
> >
> >> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
> >> replaced --dual-color with --no-dual-color but left the option's
> >> summary
Junio C Hamano writes:
> Johannes Schindelin writes:
[...]
>>> - N_("color both diff and diff-between-diffs")),
>>> + N_("restrict coloring to outer diff markers")),
>>
>> How about "use simple diff colors" instead?
That's certainly better than the
Johannes Schindelin writes:
> On Wed, 22 Aug 2018, Kyle Meyer wrote:
>
>> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
>> replaced --dual-color with --no-dual-color but left the option's
>> summary untouched. Rewrite the summary to describe --no-dual-color
>> rather
Hi,
Johannes Schindelin wrote:
> On Wed, 22 Aug 2018, Jonathan Nieder wrote:
>> OPT_INTEGER(0, "creation-factor", _factor,
>> N_("Percentage by which creation is weighted")),
>> -OPT_BOOL(0, "no-dual-color", _color,
>> -
Hi Kyle,
On Wed, 22 Aug 2018, Kyle Meyer wrote:
> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
> replaced --dual-color with --no-dual-color but left the option's
> summary untouched. Rewrite the summary to describe --no-dual-color
> rather than dual-color.
>
>
Hi Jonathan,
On Wed, 22 Aug 2018, Jonathan Nieder wrote:
> OPT_INTEGER(0, "creation-factor", _factor,
> N_("Percentage by which creation is weighted")),
> - OPT_BOOL(0, "no-dual-color", _color,
> - N_("color both diff
Kyle Meyer wrote:
> Jonathan Nieder writes:
>> I think what you mean is something like "color only based on the
>> diff-between-diffs".
>
> Yeah, I that sounds OK to me.
Thanks. Want to prepare a patch along those lines to finish this off?
I'm off to sleep now, can look at this again tomorrow
Jonathan Nieder writes:
- N_("color both diff and diff-between-diffs")),
+ N_("restrict coloring to outer diff markers")),
[...]
> Aha: I think you're missing a few words (e.g. "color only according to
> outer diff markers"). Though based on
Kyle Meyer wrote:
> Jonathan Nieder writes:
>> Kyle Meyer wrote:
>>> - N_("color both diff and diff-between-diffs")),
>>> + N_("restrict coloring to outer diff markers")),
[...]
>> What is an outer diff marker?
>
> The diff markers from the diff of
Jonathan Nieder writes:
[...]
> What is an outer diff marker?
The diff markers from the diff of patches as opposed to the ones from
the original patches. I took the term from git-range-diff.txt:
--no-dual-color::
When the commit diffs differ, `git range-diff` recreates the
Hi,
Kyle Meyer wrote:
> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
> replaced --dual-color with --no-dual-color but left the option's
> summary untouched. Rewrite the summary to describe --no-dual-color
> rather than dual-color.
>
> Signed-off-by: Kyle Meyer
> ---
>
275267937b (range-diff: make dual-color the default mode, 2018-08-13)
replaced --dual-color with --no-dual-color but left the option's
summary untouched. Rewrite the summary to describe --no-dual-color
rather than dual-color.
Signed-off-by: Kyle Meyer
---
builtin/range-diff.c | 2 +-
1 file
13 matches
Mail list logo
