From: Kyle Meyer <kyle@kyleam.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] range-diff: update stale summary of --no-dual-color
Date: Wed, 22 Aug 2018 23:03:12 -0400 [thread overview]
Message-ID: <87wosh7pjj.fsf@kyleam.com> (raw)
In-Reply-To: <20180823024719.GG92374@aiede.svl.corp.google.com>
Jonathan Nieder <jrnieder@gmail.com> 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
original diffs' coloring, and adds outer -/+ diff markers [...]
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).
--
Kyle
next prev parent reply other threads:[~2018-08-23 3:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 2:39 [PATCH] range-diff: update stale summary of --no-dual-color Kyle Meyer
2018-08-23 2:47 ` Jonathan Nieder
2018-08-23 3:03 ` Kyle Meyer [this message]
2018-08-23 3:22 ` Jonathan Nieder
2018-08-23 4:04 ` Kyle Meyer
2018-08-23 8:27 ` Jonathan Nieder
2018-08-23 12:00 ` [PATCH v2] " Kyle Meyer
2018-08-23 21:10 ` Jonathan Nieder
2018-08-23 21:57 ` [PATCH v3] " Kyle Meyer
2018-08-23 22:02 ` Jonathan Nieder
2018-08-23 22:08 ` Junio C Hamano
2018-08-23 22:11 ` Jonathan Nieder
2018-08-27 17:57 ` Junio C Hamano
2018-08-23 14:31 ` [PATCH] " Johannes Schindelin
2018-08-23 21:12 ` Jonathan Nieder
2018-08-23 20:54 ` Johannes Schindelin
2018-08-23 21:18 ` Junio C Hamano
2018-08-23 21:27 ` Kyle Meyer
2018-08-23 21:48 ` Junio C Hamano
2018-08-23 21:41 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wosh7pjj.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).