Re: [PATCH v3 20/20] range-diff: make --dual-color the default mode
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 16, 2018, 08:06 UTC
- Message-ID
- <CAPig+cSyTKLOXbfGx3z_RWbHaTZU_EKWJrCqwCaw+urQph=4Tw@mail.gmail.com>
- In-Reply-To
- <4a68b95ce2a6463708c92d1bcc0208352c14f836.1530617166.git.gitgitgadget@gmail.com>
On Tue, Jul 3, 2018 at 7:26 AM Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> After using this command extensively for the last two months, this > developer came to the conclusion that even if the dual color mode still > leaves a lot of room for confusion what was actually changed, the
"...confusion _about_ what..."
Show 16 quoted lines
> non-dual color mode is substantially worse in that regard. > > Therefore, we really want to make the dual color mode the default. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt > @@ -31,11 +31,14 @@ all of their ancestors have been shown. > ---dual-color:: > - When the commit diffs differ, recreate the original diffs' > - coloring, and add outer -/+ diff markers with the *background* > - being red/green to make it easier to see e.g. when there was a > - change in what exact lines were added. > +--no-dual-color:: > + When the commit diffs differ, `git range-diff` recreates the > + original diffs' coloring, and add outer -/+ diff markers with
s/add/adds/
Show 5 quoted lines
> + the *background* being red/green to make it easier to see e.g. > + when there was a change in what exact lines were added. This is > + known to `range-diff` as "dual coloring". Use `--no-dual-color` > + to revert to color all lines according to the outer diff markers > + (and completely ignore the inner diff when it comes to color).