Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- Documentation/am-config.txt | 14 ++++++++++++++ Documentation/config.txt | 15 +-------------- 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/am-config.txt diff --git a/Documentation/am-config.txt b/Documentation/am-config.txt new file mode 100644 index 0000000000..5bcad2efb1 --- /dev/null +++ b/Documentation/am-config.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]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 5b46310dd4..29dd694438 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,20 +295,7 @@ include::add-config.txt[] include::alias-config.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::am-config.txt[] apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in -- 2.19.1.647.g708186aaf9
