diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:51 -0700 |
| commit | 709cd912d4663af87903d3d278a3bab9d4d84153 (patch) | |
| tree | 416e3f1cbd0b50ef317b59bbb337f3a7bea72765 /Documentation | |
| parent | Sync with 2.4.3 (diff) | |
| parent | diff.c: --ws-error-highlight=<kind> option (diff) | |
| download | tgif-709cd912d4663af87903d3d278a3bab9d4d84153.tar.xz | |
Merge branch 'jc/diff-ws-error-highlight'
Allow whitespace breakages in deleted and context lines to be also
painted in the output.
* jc/diff-ws-error-highlight:
diff.c: --ws-error-highlight=<kind> option
diff.c: add emit_del_line() and emit_context_line()
t4015: separate common setup and per-test expectation
t4015: modernise style
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3ad6404dbc..d56ca90998 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -291,6 +291,16 @@ ifndef::git-format-patch[] initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code. + +--ws-error-highlight=<kind>:: + Highlight whitespace errors on lines specified by <kind> + in the color specified by `color.diff.whitespace`. <kind> + is a comma separated list of `old`, `new`, `context`. When + this option is not given, only whitespace errors in `new` + lines are highlighted. E.g. `--ws-error-highlight=new,old` + highlights whitespace errors on both deleted and added lines. + `all` can be used as a short-hand for `old,new,context`. + endif::git-format-patch[] --full-index:: |