diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-01-15 00:59:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-05 00:38:41 -0800 |
| commit | b2979ff599a6bcf9dbf5e2ef1e32b81a1b88e115 (patch) | |
| tree | b828718fd340db7f6a704caa04aa05b815a18092 /Documentation | |
| parent | git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run (diff) | |
| download | tgif-b2979ff599a6bcf9dbf5e2ef1e32b81a1b88e115.tar.xz | |
core.whitespace: cr-at-eol
This new error mode allows a line to have a carriage return at the
end of the line when checking and fixing trailing whitespace errors.
Some people like to keep CRLF line ending recorded in the repository,
and still want to take advantage of the automated trailing whitespace
stripping. We still show ^M in the diff output piped to "less" to
remind them that they do have the CR at the end, but these carriage
return characters at the end are no longer flagged as errors.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4e222f15a5..44cb640fb8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -308,6 +308,10 @@ core.whitespace:: error (enabled by default). * `indent-with-non-tab` treats a line that is indented with 8 or more space characters as an error (not enabled by default). +* `cr-at-eol` treats a carriage-return at the end of line as + part of the line terminator, i.e. with it, `trailing-space` + does not trigger if the character before such a carriage-return + is not a whitespace (not enabled by default). alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. |