diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 00:59:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 00:59:34 +0200 |
| commit | b61f55be0060ab47b154d979f919dd969f29d314 (patch) | |
| tree | 3566700e4b8f8d992d9e599b7a933473a3139ea9 /Documentation/config.txt | |
| parent | Merge branch 'mh/fetch-filter-refs' (diff) | |
| parent | t/perf: add "trash directory" to .gitignore (diff) | |
| download | git-b61f55be0060ab47b154d979f919dd969f29d314.tar.xz git-b61f55be0060ab47b154d979f919dd969f29d314.zip | |
Merge branch 'maint'
* maint:
t/perf: add "trash directory" to .gitignore
Add missing -z to git check-attr usage text for consistency with man page
git-jump: ignore (custom) prefix in diff mode
Documentation: indent-with-non-tab uses "equivalent tabs" not 8
completion: add --no-edit to git-commit
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6416cae511..11f320b962 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -559,8 +559,9 @@ core.whitespace:: * `space-before-tab` treats a space character that appears immediately before a tab character in the initial indent part of the line as an 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). +* `indent-with-non-tab` treats a line that is indented with space + characters instead of the equivalent tabs 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 |