Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
Documentation/apply-config.txt | 11 +++++++++++
Documentation/config.txt | 12 +-----------
2 files changed, 12 insertions(+), 11 deletions(-)
create mode 100644 Documentation/apply-config.txt
diff --git a/Documentation/apply-config.txt b/Documentation/apply-config.txt
new file mode 100644
index 0000000000..8fb8ef763d
--- /dev/null
+++ b/Documentation/apply-config.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].
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 29dd694438..db259129b0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -297,17 +297,7 @@ include::alias-config.txt[]
include::am-config.txt[]
-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].
+include::apply-config.txt[]
blame.blankBoundary::
Show blank commit object name for boundary commits in
--
2.19.1.647.g708186aaf9
