From: "Torsten Bögershausen" <tboegi@web.de>
To: Andrew Molyneux <andrew.molyneux@neuxpower.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)
Date: Fri, 3 May 2019 19:01:48 +0200 [thread overview]
Message-ID: <20190503170148.km4ftgg6gbgzd6pn@tb-raspi4> (raw)
In-Reply-To: <20190503140952.9029-1-andrew.molyneux@neuxpower.com>
On Fri, May 03, 2019 at 03:09:51PM +0100, Andrew Molyneux wrote:
> Encoding name was erroneously documented as UTF-16-LE-BOM; this should
> in fact be UTF-16LE-BOM (no hyphen between '16' and 'LE').
> ---
> Documentation/gitattributes.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index 9b41f81c06..bdd11a2ddd 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -346,7 +346,7 @@ automatic line ending conversion based on your platform.
>
> Use the following attributes if your '*.ps1' files are UTF-16 little
> endian encoded without BOM and you want Git to use Windows line endings
> -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
> +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
> you want UTF-16 little endian with BOM).
> Please note, it is highly recommended to
> explicitly define the line endings with `eol` if the `working-tree-encoding`
> --
> 2.21.0.windows.1
>
Thanks for the patch.
I think that patch 1/2 is in upstream Git,
and even in git-for-windows/master - on which codebase are you ?
commit e6e15194a85af68db9f9ce076eb32c47e7063b3c
gitattributes.txt: fix typo
`UTF-16-LE-BOM` to `UTF-16LE-BOM`.
this closes https://github.com/git-for-windows/git/issues/2095
Signed-off-by: Yash Bhatambare <ybhatambare@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
[snip]
-in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
+in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
Patch 2/2 makes sense and cleans up my mess.
next prev parent reply other threads:[~2019-05-03 17:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 14:09 [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Andrew Molyneux
2019-05-03 14:09 ` [PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name Andrew Molyneux
2019-05-03 17:01 ` Torsten Bögershausen [this message]
2019-05-04 9:00 ` [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Andrew Molyneux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503170148.km4ftgg6gbgzd6pn@tb-raspi4 \
--to=tboegi@web.de \
--cc=andrew.molyneux@neuxpower.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).