Skip to content

Commit 1e93770

Browse files
peffgitster
authored andcommitted
docs: use "character encoding" to refer to commit-object encoding
The word "encoding" can mean a lot of things (e.g., base64 or quoted-printable encoding in emails, HTML entities, URL encoding, and so on). The documentation for i18n.commitEncoding and i18n.logOutputEncoding uses the phrase "character encoding" to make this more clear. Let's use that phrase in other places to make it clear what kind of encoding we are talking about. This patch covers the gui.encoding option, as well as the --encoding option for git-log, etc (in this latter case, I word-smithed the sentence a little at the same time). That, coupled with the mention of iconv in the --encoding description, should make this more clear. The other spot I looked at is the working-tree-encoding section of gitattributes(5). But it gives specific examples of encodings that I think make the meaning pretty clear already. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fd680bc commit 1e93770

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/config/gui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gui.displayUntracked::
1111
in the file list. The default is "true".
1212

1313
gui.encoding::
14-
Specifies the default encoding to use for displaying of
14+
Specifies the default character encoding to use for displaying of
1515
file contents in linkgit:git-gui[1] and linkgit:gitk[1].
1616
It can be overridden by setting the 'encoding' attribute
1717
for relevant files (see linkgit:gitattributes[5]).

Documentation/pretty-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ people using 80-column terminals.
3333
used together.
3434

3535
--encoding=<encoding>::
36-
The commit objects record the encoding used for the log message
36+
Commit objects record the character encoding used for the log message
3737
in their encoding header; this option can be used to tell the
3838
command to re-code the commit log message in the encoding
3939
preferred by the user. For non plumbing commands this

0 commit comments

Comments
 (0)