diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:40 -0700 |
| commit | a81575aa91a015535374bb5b1e0e6dc2a81c74ab (patch) | |
| tree | b7bd20fdd2a3fa1401142017291591cb60cbd148 /Documentation/config.txt | |
| parent | 7a135475d327f4f4f7f1b4892f69ba7b6ee88e27 (diff) | |
| parent | 626c0b5d395196ddabcf9b9a430db385722689d4 (diff) | |
| download | git-a81575aa91a015535374bb5b1e0e6dc2a81c74ab.tar.gz | |
Merge branch 'sb/diff-color-move-more'
"git diff --color-moved" feature has further been tweaked.
* sb/diff-color-move-more:
diff.c: offer config option to control ws handling in move detection
diff.c: add white space mode to move detection that allows indent changes
diff.c: factor advance_or_nullify out of mark_color_as_moved
diff.c: decouple white space treatment from move detection algorithm
diff.c: add a blocks mode for moved code detection
diff.c: adjust hash function signature to match hashmap expectation
diff.c: do not pass diff options as keydata to hashmap
t4015: avoid git as a pipe input
xdiff/xdiffi.c: remove unneeded function declarations
xdiff/xdiff.h: remove unused flags
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8c4831b82f..3fdc6f0327 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1152,6 +1152,11 @@ diff.colorMoved:: true the default color mode will be used. When set to false, moved lines are not colored. +diff.colorMovedWS:: + When moved lines are colored using e.g. the `diff.colorMoved` setting, + this option controls the `<mode>` how spaces are treated + for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1]. + color.diff.<slot>:: Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one |