Home Explore Blog CI



git

Documentation/config/am.adoc
7239029a5876e6edaaf7572a42cdeb4319e90f5da9a6376700000003000002b3
am.keepcr::
	If true, git-am will call git-mailsplit for patches in mbox format
	with parameter `--keep-cr`. In this case git-mailsplit will
	not remove `\r` from lines ending with `\r\n`. Can be overridden
	by giving `--no-keep-cr` from the command line.
	See linkgit:git-am[1], linkgit:git-mailsplit[1].

am.threeWay::
	By default, `git am` will fail if the patch does not apply cleanly. When
	set to true, this setting tells `git am` 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 `--3way`
	option from the command line). Defaults to `false`.
	See linkgit:git-am[1].

Chunks
a1bb803d (1st chunk of `Documentation/config/am.adoc`)
Title: Git Am Configuration Options
Summary
The text describes two git-am configuration options: am.keepcr, which controls the handling of carriage returns in mbox format patches, and am.threeWay, which allows git-am to fall back on 3-way merge when a patch does not apply cleanly.