| Message ID | xmqqy2fe1t6o.fsf_-_@gitster.g (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 77645b5daa6eaa4ab0502ef00817c87f7666bfec |
| Headers | show |
| Series | [v2] i18n.txt: camel case and monospace "i18n.commitEncoding" | expand |
On Tue, Feb 23, 2021 at 2:28 PM Junio C Hamano <gitster@pobox.com> wrote: > In 95791be750 (doc: camelCase the i18n config variables to improve > readability, 2017-07-17), the other i18n config variables were > camel cased. However, this one instance was missed. > > Camel case and monospace "i18n.commitEncoding" so that it matches the > surrounding text. > > Signed-off-by: Denton Liu <liu.denton@gmail.com> > [jc: fixed 3 other mistakes that are exactly the same] > Signed-off-by: Junio C Hamano <gitster@pobox.com> > --- > * So, while I still remember, I amended your commit and queued > this. Denton's authorship seems to have been lost (no From: header). Was that intentional?
Eric Sunshine <sunshine@sunshineco.com> writes: > On Tue, Feb 23, 2021 at 2:28 PM Junio C Hamano <gitster@pobox.com> wrote: >> In 95791be750 (doc: camelCase the i18n config variables to improve >> readability, 2017-07-17), the other i18n config variables were >> camel cased. However, this one instance was missed. >> >> Camel case and monospace "i18n.commitEncoding" so that it matches the >> surrounding text. >> >> Signed-off-by: Denton Liu <liu.denton@gmail.com> >> [jc: fixed 3 other mistakes that are exactly the same] >> Signed-off-by: Junio C Hamano <gitster@pobox.com> >> --- >> * So, while I still remember, I amended your commit and queued >> this. > > Denton's authorship seems to have been lost (no From: header). Was > that intentional? I didn't even notice. I actually expect that Denton will produce a more complete series based on the "comm -3" output, so that this patch itself (or its authorship) won't matter ;-) And I also expect that somebody will take the "two greps and comm" trick I showed and wrap it into some form of doc-lint. Hint, hint... Thanks.
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 06bc063542..decd8ae122 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -79,7 +79,7 @@ OPTIONS Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable - `i18n.commitencoding` can be used to specify project's + `i18n.commitEncoding` can be used to specify project's preferred encoding if it is not UTF-8). + This was optional in prior versions of git, but now it is the diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 7a6aed0e30..d343f040f5 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -53,7 +53,7 @@ character. The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by - i18n.commitencoding (defaulting to UTF-8) by transliterating + `i18n.commitEncoding` (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default. + Note that the patch is always used as-is without charset @@ -61,7 +61,7 @@ conversion, even with this flag. --encoding=<encoding>:: Similar to -u. But when re-coding, the charset specified here is - used instead of the one specified by i18n.commitencoding or UTF-8. + used instead of the one specified by `i18n.commitEncoding` or UTF-8. -n:: Disable all charset re-coding of the metadata. diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt index 7e36e5b55b..6c6baeeeb7 100644 --- a/Documentation/i18n.txt +++ b/Documentation/i18n.txt @@ -38,7 +38,7 @@ mind. a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to - have i18n.commitencoding in `.git/config` file, like this: + have `i18n.commitEncoding` in `.git/config` file, like this: + ------------ [i18n]