diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:22:40 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:00 +0900 |
commit | 696d4796fb4fe5c8538be9dcc6daeb857f9ff894 (patch) | |
tree | dcf884f4709dceae031df3e189d72a6fc2e9a9dc /Documentation/config.txt | |
parent | d293ffefb575466cea5f9912a3cbf28d574d22b3 (diff) | |
download | git-696d4796fb4fe5c8538be9dcc6daeb857f9ff894.tar.gz |
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.txt')
-rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5e0f76fc6e..c8d20227a8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::config/alias.txt[] include::config/am.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::config/apply.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in |