Browse Source

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>
maint
Nguyễn Thái Ngọc Duy 6 years ago committed by Junio C Hamano
parent
commit
696d4796fb
  1. 12
      Documentation/config.txt
  2. 11
      Documentation/config/apply.txt

12
Documentation/config.txt

@ -297,17 +297,7 @@ include::config/alias.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

11
Documentation/config/apply.txt

@ -0,0 +1,11 @@ @@ -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].
Loading…
Cancel
Save