diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
commit | f09b7cd0fc08d1df0fbd5c756672772049836b7a (patch) | |
tree | f5407aed048f255184084b9127f43dbf337eb27a /diff-options.txt | |
parent | 1ff0338e53a8f0c62e5a9370e770e20058c5ad1e (diff) | |
download | git-htmldocs-f09b7cd0fc08d1df0fbd5c756672772049836b7a.tar.gz |
Autogenerated HTML docs for v2.18.0-547-g1d893
Diffstat (limited to 'diff-options.txt')
-rw-r--r-- | diff-options.txt | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/diff-options.txt b/diff-options.txt index 41064909e..f394608b4 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -276,10 +276,14 @@ plain:: that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation. -zebra:: +blocks:: Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are - painted using either the 'color.diff.{old,new}Moved' color or + painted using either the 'color.diff.{old,new}Moved' color. + Adjacent blocks cannot be told apart. +zebra:: + Blocks of moved text are detected as in 'blocks' mode. The 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:: @@ -288,6 +292,31 @@ dimmed_zebra:: blocks are considered interesting, the rest is uninteresting. -- +--color-moved-ws=<modes>:: + This configures how white spaces are ignored when performing the + move detection for `--color-moved`. +ifdef::git-diff[] + It can be set by the `diff.colorMovedWS` configuration setting. +endif::git-diff[] + These modes can be given as a comma separated list: ++ +-- +ignore-space-at-eol:: + Ignore changes in whitespace at EOL. +ignore-space-change:: + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent. +ignore-all-space:: + Ignore whitespace when comparing lines. This ignores differences + even if one line has whitespace where the other line has none. +allow-indentation-change:: + Initially ignore any white spaces in the move detection, then + group the moved code blocks only into a block if the change in + whitespace is the same per line. This is incompatible with the + other modes. +-- + --word-diff[=<mode>]:: Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see |