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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:22 UTC
d293ffefb575466cea5f9912a3cbf28d574d22b3
2 files changed
+15
-14
Documentation/config.txt
+1
-14
@@ -295,20 +295,7 @@ include::config/add.txt[]
295
296
include::config/alias.txt[]
297
298
-am.keepcr::
299
- If true, git-am will call git-mailsplit for patches in mbox format
300
- with parameter `--keep-cr`. In this case git-mailsplit will
301
- not remove `\r` from lines ending with `\r\n`. Can be overridden
302
- by giving `--no-keep-cr` from the command line.
303
- See linkgit:git-am[1], linkgit:git-mailsplit[1].
304
-
305
-am.threeWay::
306
- By default, `git am` will fail if the patch does not apply cleanly. When
307
- set to true, this setting tells `git am` to fall back on 3-way merge if
308
- the patch records the identity of blobs it is supposed to apply to and
309
- we have those blobs available locally (equivalent to giving the `--3way`
310
- option from the command line). Defaults to `false`.
311
- See linkgit:git-am[1].
298
+include::config/am.txt[]
299
300
apply.ignoreWhitespace::
301
When set to 'change', tells 'git apply' to ignore changes in
Documentation/config/am.txt
new
+14
@@ -0,0 +1,14 @@
1
+am.keepcr::
2
+ If true, git-am will call git-mailsplit for patches in mbox format
3
+ with parameter `--keep-cr`. In this case git-mailsplit will
4
+ not remove `\r` from lines ending with `\r\n`. Can be overridden
5
+ by giving `--no-keep-cr` from the command line.
6
+ See linkgit:git-am[1], linkgit:git-mailsplit[1].
7
+
8
+am.threeWay::
9
+ By default, `git am` will fail if the patch does not apply cleanly. When
10
+ set to true, this setting tells `git am` to fall back on 3-way merge if
11
+ the patch records the identity of blobs it is supposed to apply to and
12
+ we have those blobs available locally (equivalent to giving the `--3way`
13
+ option from the command line). Defaults to `false`.
14
+ See linkgit:git-am[1].