diff options
Diffstat (limited to 'man1/git-am.1')
| -rw-r--r-- | man1/git-am.1 | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/man1/git-am.1 b/man1/git-am.1 index dd3c0f366..21009cab0 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: 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\-AM" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-AM" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -362,6 +362,35 @@ Before any patches are applied, ORIG_HEAD is set to the tip of the current branc .SH "HOOKS" .sp This command can run \fBapplypatch\-msg\fR, \fBpre\-applypatch\fR, and \fBpost\-applypatch\fR hooks\&. See \fBgithooks\fR(5) for more information\&. +.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 +am\&.keepcr +.RS 4 +If true, git\-am will call git\-mailsplit for patches in mbox format with parameter +\fB\-\-keep\-cr\fR\&. In this case git\-mailsplit will not remove +\fB\er\fR +from lines ending with +\fB\er\en\fR\&. Can be overridden by giving +\fB\-\-no\-keep\-cr\fR +from the command line\&. See +\fBgit-am\fR(1), +\fBgit-mailsplit\fR(1)\&. +.RE +.PP +am\&.threeWay +.RS 4 +By default, +\fBgit am\fR +will fail if the patch does not apply cleanly\&. When set to true, this setting tells +\fBgit am\fR +to fall back on 3\-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the +\fB\-\-3way\fR +option from the command line)\&. Defaults to +\fBfalse\fR\&. See +\fBgit-am\fR(1)\&. +.RE .SH "SEE ALSO" .sp \fBgit-apply\fR(1)\&. |