summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-25 01:23:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-25 01:23:17 (GMT)
commite38f892d1832977511c4e7c82204c7f94c3a3232 (patch)
treeebbab519e098092d766d8391354995e5bfef6ba2 /Documentation/config.txt
parentdc31cd8fcc20d95a80da5ebe6feaab01539ebe4c (diff)
parentfe3403c3205de44faa926a086b4b99f157fc63fe (diff)
downloadgit-e38f892d1832977511c4e7c82204c7f94c3a3232.zip
git-e38f892d1832977511c4e7c82204c7f94c3a3232.tar.gz
git-e38f892d1832977511c4e7c82204c7f94c3a3232.tar.bz2
Merge branch 'jc/apply-whitespace'
* jc/apply-whitespace: ws_fix_copy(): move the whitespace fixing function to ws.c apply: do not barf on patch with too large an offset core.whitespace: cr-at-eol git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run builtin-apply.c: pass ws_rule down to match_fragment() builtin-apply.c: move copy_wsfix() function a bit higher. builtin-apply.c: do not feed copy_wsfix() leading '+' builtin-apply.c: simplify calling site to apply_line() builtin-apply.c: clean-up apply_one_fragment() builtin-apply.c: mark common context lines in lineinfo structure. builtin-apply.c: optimize match_beginning/end processing a bit. builtin-apply.c: make it more line oriented builtin-apply.c: push match-beginning/end logic down builtin-apply.c: restructure "offset" matching builtin-apply.c: refactor small part that matches context
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7b67671..fb6dae0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -353,6 +353,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.