config.txt: move am.* 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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f207cae90cf97b76b94b0f0deb12993d9262da99..5e0f76fc6eb1d5d4a6f266d7c0cc56e681ceac14 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -295,20 +295,7 @@ include::config/add.txt[]
 
 include::config/alias.txt[]
 
 
 include::config/alias.txt[]
 

-am.keepcr::
-       If true, git-am will call git-mailsplit for patches in mbox format
-       with parameter `--keep-cr`. In this case git-mailsplit will
-       not remove `\r` from lines ending with `\r\n`. Can be overridden
-       by giving `--no-keep-cr` from the command line.
-       See linkgit:git-am[1], linkgit:git-mailsplit[1].
-
-am.threeWay::
-       By default, `git am` will fail if the patch does not apply cleanly. When
-       set to true, this setting tells `git am` to fall back on 3-way merge if
-       the patch records the identity of blobs it is supposed to apply to and
-       we have those blobs available locally (equivalent to giving the `--3way`
-       option from the command line). Defaults to `false`.
-       See linkgit:git-am[1].
+include::config/am.txt[]

 
 apply.ignoreWhitespace::
        When set to 'change', tells 'git apply' to ignore changes in
 
 apply.ignoreWhitespace::
        When set to 'change', tells 'git apply' to ignore changes in

diff --git a/Documentation/config/am.txt b/Documentation/config/am.txt
new file mode 100644 (file)
index 0000000..5bcad2e
--- /dev/null
+++ b/Documentation/config/am.txt
@@ -0,0 +1,14 @@
+am.keepcr::
+       If true, git-am will call git-mailsplit for patches in mbox format
+       with parameter `--keep-cr`. In this case git-mailsplit will
+       not remove `\r` from lines ending with `\r\n`. Can be overridden
+       by giving `--no-keep-cr` from the command line.
+       See linkgit:git-am[1], linkgit:git-mailsplit[1].
+
+am.threeWay::
+       By default, `git am` will fail if the patch does not apply cleanly. When
+       set to true, this setting tells `git am` to fall back on 3-way merge if
+       the patch records the identity of blobs it is supposed to apply to and
+       we have those blobs available locally (equivalent to giving the `--3way`
+       option from the command line). Defaults to `false`.
+       See linkgit:git-am[1].