diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-09 10:23:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-09 10:23:48 +0100 |
| commit | 4eb39e9bcccc54eb23af8a7e2676c63e5bf32866 (patch) | |
| tree | c6a62b68b86275d7db7bda65fa448c92feeba130 /Documentation/config.txt | |
| parent | Merge branch 'pr/mergetool' (diff) | |
| parent | Use gitattributes to define per-path whitespace rule (diff) | |
| download | git-4eb39e9bcccc54eb23af8a7e2676c63e5bf32866.tar.xz git-4eb39e9bcccc54eb23af8a7e2676c63e5bf32866.zip | |
Merge branch 'jc/spht'
* jc/spht:
Use gitattributes to define per-path whitespace rule
core.whitespace: documentation updates.
builtin-apply: teach whitespace_rules
builtin-apply: rename "whitespace" variables and fix styles
core.whitespace: add test for diff whitespace error highlighting
git-diff: complain about >=8 consecutive spaces in initial indent
War on whitespace: first, a bit of retreat.
Conflicts:
cache.h
config.c
diff.c
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 79d51f26cc..fabe7f859f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,6 +295,20 @@ core.pager:: The command that git will use to paginate output. Can be overridden with the `GIT_PAGER` environment variable. +core.whitespace:: + A comma separated list of common whitespace problems to + notice. `git diff` will use `color.diff.whitespace` to + highlight them, and `git apply --whitespace=error` will + consider them as errors: ++ +* `trailing-space` treats trailing whitespaces at the end of the line + as an error (enabled by default). +* `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 that can be replaced with tab characters. + alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation @@ -387,8 +401,8 @@ color.diff.<slot>:: which part of the patch to use the specified color, and is one of `plain` (context text), `meta` (metainformation), `frag` (hunk header), `old` (removed lines), `new` (added lines), - `commit` (commit headers), or `whitespace` (highlighting dubious - whitespace). The values of these variables may be specified as + `commit` (commit headers), or `whitespace` (highlighting + whitespace errors). The values of these variables may be specified as in color.branch.<slot>. color.interactive:: |