diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-11-23 11:16:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-10 10:37:42 -0800 |
| commit | 748aa1aa34a316b8f26a3664f3fdcd273e1c5c39 (patch) | |
| tree | 6d7e8edb44ccb3c9e0005da0a3637a399466fff8 /Documentation/diff-options.txt | |
| parent | fbafb7c682272e039e7aacbf8c0ef8de3c0eb157 (diff) | |
| download | git-748aa1aa34a316b8f26a3664f3fdcd273e1c5c39.tar.gz | |
Use "whitespace" consistently
Most of the messages and documentation use 'whitespace' rather than
'white space' or 'white spaces' convert to latter two to the former for
consistency.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 151690f814..57a2f4cb7a 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -298,7 +298,7 @@ dimmed-zebra:: settings. It is the same as `--color-moved=no`. --color-moved-ws=<modes>:: - This configures how white spaces are ignored when performing the + This configures how whitespace is ignored when performing the move detection for `--color-moved`. ifdef::git-diff[] It can be set by the `diff.colorMovedWS` configuration setting. @@ -316,7 +316,7 @@ 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 + Initially ignore any whitespace 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. |