diff options
Diffstat (limited to 'man1/git-am.1')
-rw-r--r-- | man1/git-am.1 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/man1/git-am.1 b/man1/git-am.1 index 49b2650cc..b123ed5ae 100644 --- a/man1/git-am.1 +++ b/man1/git-am.1 @@ -2,12 +2,12 @@ .\" Title: git-am .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-02-26 +.\" Date: 2024-02-27 .\" Manual: Git Manual -.\" Source: Git 2.44.0.35.ga2082dbdd3 +.\" Source: Git 2.44.0.53.g0f9d4d28b7 .\" Language: English .\" -.TH "GIT\-AM" "1" "2024\-02\-26" "Git 2\&.44\&.0\&.35\&.ga2082db" "Git Manual" +.TH "GIT\-AM" "1" "2024\-02\-27" "Git 2\&.44\&.0\&.53\&.g0f9d4d2" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -202,6 +202,15 @@ These flags are passed to the \fIgit apply\fR (see \fBgit-apply\fR(1)) program that applies the patch\&. +.sp +Valid <action> for the +\fB\-\-whitespace\fR +option are: +\fBnowarn\fR, +\fBwarn\fR, +\fBfix\fR, +\fBerror\fR, and +\fBerror\-all\fR\&. .RE .PP \-\-patch\-format |