kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2018-10-27 08:22:40 +02:00 committed by Junio C Hamano
parent d293ffefb5
commit 696d4796fb
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/config.txt
View File

@ -297,17 +297,7 @@ include::config/alias.txt[]


include::config/am.txt[] include::config/am.txt[]


apply.ignoreWhitespace:: include::config/apply.txt[]
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].


blame.blankBoundary:: blame.blankBoundary::
Show blank commit object name for boundary commits in Show blank commit object name for boundary commits in

11
Documentation/config/apply.txt Normal file
View File

@ -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].