Skip to content

Commit

Permalink
config.txt: move apply.* to a separate file
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
pclouds authored and gitster committed Oct 29, 2018
1 parent d293ffe commit 696d479
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
12 changes: 1 addition & 11 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions Documentation/config/apply.txt
Original file line number Diff line number Diff line change
@@ -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].

0 comments on commit 696d479

Please sign in to comment.