From 43b8e4ea1e09d204d75c2e8d3a250c026315b4b0 Mon Sep 17 00:00:00 2001
From: Remko Popma <remkop@yahoo.com>
Date: Tue, 28 Sep 2021 10:59:33 +0900
Subject: [PATCH] [#1431] Bugfix/enhancement: `.gitattributes` should include
 HTML files to convert CRLF to LF.

Closes #1431
---
 .gitattributes   | 1 +
 RELEASE-NOTES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 512b46f95..7346fef62 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,6 +16,7 @@
 *.properties    text
 *.txt           text
 *.yml           text
+*.html          text
 
 # These files are text and must be normalized to lf
 gradlew         text eol=lf
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 38474250a..5d42d5523 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -35,6 +35,7 @@ Picocli follows [semantic versioning](http://semver.org/).
 * [#1381][#1382] Bugfix: Default value of option in repeated subcommand was not applied correctly. Thanks to [sfeuerhahn](https://github.com/sfeuerhahn) for the pull request.
 * [#1434][#1435] `CommandSpec.remove(arg)` should also remove the arg from the `args` collection in the CommandSpec. Thanks to [kaushalkumar](https://github.com/kaushalkumar) for the pull request.
 * [#1320][#1321] Bugfix/Enhancement: Use system properties `sun.stdout.encoding` and `sun.stderr.encoding` when creating the `PrintWriters` returned by  `CommandLine::getOut` and `CommandLine::getErr`. Thanks to [Philippe Charles](https://github.com/charphi) for the investigation and the pull request.
+* [#1431] Bugfix/enhancement: `.gitattributes` should include HTML files to convert CRLF to LF. Thanks to [wenhoujx](https://github.com/wenhoujx) for pointing this out.
 * [#1415] Bugfix/DOC: fix NullPointerException in README Example. Thanks to [shannonbay](https://github.com/shannonbay) for raising this.
 * [#1421] Bugfix/DOC: `execute` method in `RunAll`, `RunFirst` and `RunLast` should not be deprecated. Thanks to [Gamal DeWeever](https://github.com/gadeweever) for raising this.
 * [#1326][#1339] DOC: Added documentation and examples for controlling the locale. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.