diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:35 -0700 |
| commit | c58c5129d6f0a35ee62bcc0892209a2400e9f4e6 (patch) | |
| tree | 17afc52b50aa2f5a28c13afbe0fd0e21e813b22d /Documentation | |
| parent | f78eeeaf55a4f60a05d3e6452f29a2214c29b6fd (diff) | |
| parent | a347b17f15dd5358ced8d447af144a46b224982d (diff) | |
| download | git-c58c5129d6f0a35ee62bcc0892209a2400e9f4e6.tar.gz git-c58c5129d6f0a35ee62bcc0892209a2400e9f4e6.tar.xz | |
Merge branch 'cw/ws-indent-with-tab'
* cw/ws-indent-with-tab:
whitespace: tests for git-apply --whitespace=fix with tab-in-indent
whitespace: add tab-in-indent support for --whitespace=fix
whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
whitespace: tests for git-diff --check with tab-in-indent error class
whitespace: add tab-in-indent error class
whitespace: we cannot "catch all errors known to git" anymore
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8f86050b0..6308026bf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -481,6 +481,8 @@ 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). +* `tab-in-indent` treats a tab character in the initial indent part of + the line as an error (not enabled by default). * `blank-at-eof` treats blank lines added at the end of file as an error (enabled by default). * `trailing-space` is a short-hand to cover both `blank-at-eol` and |