1f010d6bdf
We presently use the ".txt" extension for our AsciiDoc files. While not wrong, most editors do not associate this extension with AsciiDoc, meaning that contributors don't get automatic editor functionality that could be useful, such as syntax highlighting and prose linting. It is much more common to use the ".adoc" extension for AsciiDoc files, since this helps editors automatically detect files and also allows various forges to provide rich (HTML-like) rendering. Let's do that here, renaming all of the files and updating the includes where relevant. Adjust the various build scripts and makefiles to use the new extension as well. Note that this should not result in any user-visible changes to the documentation. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 lines
691 B
Plaintext
15 lines
691 B
Plaintext
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].
|