diff options
Diffstat (limited to 'man1/git-am.1')
| -rw-r--r-- | man1/git-am.1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man1/git-am.1 b/man1/git-am.1 index 505c60bf2..d9f39ef60 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: 2023-10-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GIT\-AM" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GIT\-AM" "1" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -35,7 +35,7 @@ git-am \- Apply a series of patches from a mailbox \fIgit am\fR [\-\-signoff] [\-\-keep] [\-\-[no\-]keep\-cr] [\-\-[no\-]utf8] [\-\-no\-verify] [\-\-[no\-]3way] [\-\-interactive] [\-\-committer\-date\-is\-author\-date] [\-\-ignore\-date] [\-\-ignore\-space\-change | \-\-ignore\-whitespace] - [\-\-whitespace=<option>] [\-C<n>] [\-p<n>] [\-\-directory=<dir>] + [\-\-whitespace=<action>] [\-C<n>] [\-p<n>] [\-\-directory=<dir>] [\-\-exclude=<path>] [\-\-include=<path>] [\-\-reject] [\-q | \-\-quiet] [\-\-[no\-]scissors] [\-S[<keyid>]] [\-\-patch\-format=<format>] [\-\-quoted\-cr=<action>] @@ -196,7 +196,7 @@ did and catch potential mismerges, before committing the result to the index wit \fBgit add\fR\&. .RE .PP -\-\-ignore\-space\-change, \-\-ignore\-whitespace, \-\-whitespace=<option>, \-C<n>, \-p<n>, \-\-directory=<dir>, \-\-exclude=<path>, \-\-include=<path>, \-\-reject +\-\-ignore\-space\-change, \-\-ignore\-whitespace, \-\-whitespace=<action>, \-C<n>, \-p<n>, \-\-directory=<dir>, \-\-exclude=<path>, \-\-include=<path>, \-\-reject .RS 4 These flags are passed to the \fIgit apply\fR |