diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:30 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:30 +0300 |
commit | bfe37f3dc5a7750dd77c571ada91112b4389ffae (patch) | |
tree | 22e1e1c9d8d70ef5e3d6d2fedad594b3d73deb56 /Documentation/config | |
parent | a4b1a0ade42a03e81376144653400c061fa6ed52 (diff) | |
parent | 1e93770888d3e71422f9f8defab216f1ebf977c3 (diff) |
Merge branch 'jk/log-warn-on-bogus-encoding'
Doc update plus improved error reporting.
* jk/log-warn-on-bogus-encoding:
docs: use "character encoding" to refer to commit-object encoding
logmsg_reencode(): warn when iconv() fails
Diffstat (limited to 'Documentation/config')
-rw-r--r-- | Documentation/config/gui.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/gui.txt b/Documentation/config/gui.txt index d30831a130..0c087fd8c9 100644 --- a/Documentation/config/gui.txt +++ b/Documentation/config/gui.txt @@ -11,7 +11,7 @@ gui.displayUntracked:: in the file list. The default is "true". gui.encoding:: - Specifies the default encoding to use for displaying of + Specifies the default character encoding to use for displaying of file contents in linkgit:git-gui[1] and linkgit:gitk[1]. It can be overridden by setting the 'encoding' attribute for relevant files (see linkgit:gitattributes[5]). |