From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, avarab@gmail.com, peff@peff.net,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 4/6] Documentation/diff: reword color moved
Date: Tue, 27 Jun 2017 17:56:49 -0700 [thread overview]
Message-ID: <20170628005651.8110-5-sbeller@google.com> (raw)
In-Reply-To: <20170628005651.8110-1-sbeller@google.com>
This is easier for the casual reader.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Documentation/config.txt | 6 ++++--
Documentation/diff-options.txt | 7 ++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 29e0b9fa69..3d89be2d84 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1052,8 +1052,10 @@ This does not affect linkgit:git-format-patch[1] or the
command line with the `--color[=<when>]` option.
diff.colorMoved::
- If set moved lines in a diff are colored differently,
- for details see '--color-moved' in linkgit:git-diff[1].
+ If set to either a valid `<mode>` or a true value, moved lines
+ in a diff are colored differently, for details of valid modes
+ see '--color-moved' in linkgit:git-diff[1]. If simply set to
+ true the default color mode will be used.
color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d2c6a60af2..d4dc46ee2f 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -252,9 +252,10 @@ plain::
Similarly 'color.diff.oldMoved' will be used for removed lines
that are added somewhere else in the diff.
zebra::
- Blocks of moved code are detected. The detected blocks are
- painted using the 'color.diff.{old,new}Moved' alternating with
- 'color.diff.{old,new}MovedAlternative'.
+ Blocks of moved code are detected greedily. The detected blocks are
+ painted using either the 'color.diff.{old,new}Moved' color or
+ 'color.diff.{old,new}MovedAlternative'. The change between
+ the two colors indicates that a new block was detected.
dimmed_zebra::
Similar to 'zebra', but additional dimming of uninteresting parts
of moved code is performed. The bordering lines of two adjacent
--
2.13.0.31.g9b732c453e
next prev parent reply other threads:[~2017-06-28 0:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 0:56 [PATCH 0/6] Fixing up sb/diff-color-moved Stefan Beller
2017-06-28 0:56 ` [PATCH 1/6] diff.c: factor out shrinking of potential moved line blocks Stefan Beller
2017-06-28 0:56 ` [PATCH 2/6] diff.c: change the default for move coloring to zebra Stefan Beller
2017-06-28 3:14 ` Junio C Hamano
2017-06-28 19:54 ` Stefan Beller
2017-06-28 0:56 ` [PATCH 3/6] diff.c: better reporting on color.moved bogus configuration Stefan Beller
2017-06-28 0:56 ` Stefan Beller [this message]
2017-06-28 3:25 ` [PATCH 4/6] Documentation/diff: reword color moved Junio C Hamano
2017-06-28 0:56 ` [PATCH 5/6] diff.c: omit uninteresting moved lines Stefan Beller
2017-06-28 3:31 ` Junio C Hamano
2017-06-28 20:00 ` Stefan Beller
2017-06-28 0:56 ` [PATCH 6/6] diff.c: detect blocks despite whitespace changes Stefan Beller
2017-06-28 3:41 ` Junio C Hamano
2017-06-28 5:06 ` Junio C Hamano
2017-06-28 20:36 ` Stefan Beller
2017-06-28 21:16 ` Junio C Hamano
2017-06-29 21:01 ` Stefan Beller
2017-06-29 23:51 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170628005651.8110-5-sbeller@google.com \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).