diff options
Diffstat (limited to 'man1/git-apply.1')
| -rw-r--r-- | man1/git-apply.1 | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 52f03f0bb..acf46bdc7 100644 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -2,12 +2,12 @@ .\" Title: git-apply .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-APPLY" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-APPLY" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -366,19 +366,30 @@ is in use\&. Don\(cqt return error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. .RE .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP apply\&.ignoreWhitespace .RS 4 -Set to -\fIchange\fR -if you want changes in whitespace to be ignored by default\&. Set to one of: no, none, never, false if you want changes in whitespace to be significant\&. +When set to +\fIchange\fR, tells +\fIgit apply\fR +to ignore changes in whitespace, in the same way as the +\fB\-\-ignore\-space\-change\fR +option\&. When set to one of: no, none, never, false tells +\fIgit apply\fR +to respect all whitespace differences\&. See +\fBgit-apply\fR(1)\&. .RE .PP apply\&.whitespace .RS 4 -When no +Tells +\fIgit apply\fR +how to handle whitespaces, in the same way as the \fB\-\-whitespace\fR -flag is given from the command line, this configuration item is used as the default\&. +option\&. See +\fBgit-apply\fR(1)\&. .RE .SH "SUBMODULES" .sp |