diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
| commit | 09e72204f87db7226af97b12beff6774946af71b (patch) | |
| tree | 6b88983f70e1933a25b483802031bb405d822a1e /Documentation/git-am.txt | |
| parent | Merge branch 'js/params-vs-args' (diff) | |
| parent | index-format doc: camelCase core.excludesFile (diff) | |
| download | tgif-09e72204f87db7226af97b12beff6774946af71b.tar.xz | |
Merge branch 'dl/doc-config-camelcase'
A handful of multi-word configuration variable names in
documentation that are spelled in all lowercase have been corrected
to use the more canonical camelCase.
* dl/doc-config-camelcase:
index-format doc: camelCase core.excludesFile
blame-options.txt: camelcase blame.blankBoundary
i18n.txt: camel case and monospace "i18n.commitEncoding"
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |