diff options
Diffstat (limited to 'man1/git-apply.1')
| -rw-r--r-- | man1/git-apply.1 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 8eed0c00e..e8f0cbd9c 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: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-APPLY" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-APPLY" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -44,7 +44,7 @@ git-apply \- Apply a patch to files and/or to the index .sp .SH "DESCRIPTION" .sp -Reads the supplied diff output (i\&.e\&. "a patch") and applies it to files\&. When running from a subdirectory in a repository, patched paths outside the directory are ignored\&. With the \fB\-\-index\fR option the patch is also applied to the index, and with the \fB\-\-cached\fR option the patch is only applied to the index\&. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository\&. +Reads the supplied diff output (i\&.e\&. "a patch") and applies it to files\&. When running from a subdirectory in a repository, patched paths outside the directory are ignored\&. With the \fB\-\-index\fR option, the patch is also applied to the index, and with the \fB\-\-cached\fR option, the patch is only applied to the index\&. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository\&. .sp This command applies the patch but does not create a commit\&. Use \fBgit-am\fR(1) to create commits from patches generated by \fBgit-format-patch\fR(1) and/or received by email\&. .SH "OPTIONS" @@ -72,7 +72,7 @@ instead of saying .PP \-\-summary .RS 4 -Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes\&. Turns off "apply"\&. +Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames, and mode changes\&. Turns off "apply"\&. .RE .PP \-\-check @@ -181,7 +181,7 @@ expects that the patch being applied is a unified diff with at least one line of \fB\-\-unified=0\fR\&. To bypass these checks use \fB\-\-unidiff\-zero\fR\&. .sp -Note, for the reasons stated above usage of context\-free patches is discouraged\&. +Note, for the reasons stated above, the usage of context\-free patches is discouraged\&. .RE .PP \-\-apply @@ -201,7 +201,7 @@ on them and applying the result with this option, which would apply the deletion .PP \-\-allow\-binary\-replacement, \-\-binary .RS 4 -Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so\&. Currently we always allow binary patch application, so this is a no\-op\&. +Historically we did not allow binary patch application without an explicit permission from the user, and this flag was the way to do so\&. Currently, we always allow binary patch application, so this is a no\-op\&. .RE .PP \-\-exclude=<path\-pattern> @@ -363,7 +363,7 @@ is in use\&. .PP \-\-allow\-empty .RS 4 -Don\(cqt return error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. +Don\(cqt return an error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. .RE .SH "CONFIGURATION" .sp @@ -376,7 +376,7 @@ When set to \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 +option\&. When set to one of: no, none, never, false, it tells \fIgit apply\fR to respect all whitespace differences\&. See \fBgit-apply\fR(1)\&. @@ -386,7 +386,7 @@ apply\&.whitespace .RS 4 Tells \fIgit apply\fR -how to handle whitespaces, in the same way as the +how to handle whitespace, in the same way as the \fB\-\-whitespace\fR option\&. See \fBgit-apply\fR(1)\&. |