summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:22:40 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:00 +0900
commit696d4796fb4fe5c8538be9dcc6daeb857f9ff894 (patch)
treedcf884f4709dceae031df3e189d72a6fc2e9a9dc /Documentation/config
parentconfig.txt: move am.* to a separate file (diff)
downloadtgif-696d4796fb4fe5c8538be9dcc6daeb857f9ff894.tar.xz
config.txt: move apply.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/apply.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt
new file mode 100644
index 0000000000..8fb8ef763d
--- /dev/null
+++ b/Documentation/config/apply.txt
@@ -0,0 +1,11 @@
+apply.ignoreWhitespace::
+ When set to 'change', tells 'git apply' to ignore changes in
+ whitespace, in the same way as the `--ignore-space-change`
+ option.
+ When set to one of: no, none, never, false tells 'git apply' to
+ respect all whitespace differences.
+ See linkgit:git-apply[1].
+
+apply.whitespace::
+ Tells 'git apply' how to handle whitespaces, in the same way
+ as the `--whitespace` option. See linkgit:git-apply[1].