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>
13 lines
432 B
Plaintext
13 lines
432 B
Plaintext
Git v1.7.9.6 Release Notes
|
|
==========================
|
|
|
|
Fixes since v1.7.9.5
|
|
--------------------
|
|
|
|
* "git merge $tag" to merge an annotated tag always opens the editor
|
|
during an interactive edit session. v1.7.10 series introduced an
|
|
environment variable GIT_MERGE_AUTOEDIT to help older scripts decline
|
|
this behaviour, but the maintenance track should also support it.
|
|
|
|
Also contains minor fixes and documentation updates.
|