diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
| commit | eff73751bb94b0241fd2204effb8680fe9973cbf (patch) | |
| tree | 5fe6f0f55988d64a7b8b841c62b1c996a3fda5bf /Documentation | |
| parent | Allow non-fast-forward of remote tracking branches in default clone (diff) | |
| parent | t3900: test conversion to non UTF-8 as well (diff) | |
| download | tgif-eff73751bb94b0241fd2204effb8680fe9973cbf.tar.xz | |
Merge branch 'jc/utf8'
* jc/utf8:
t3900: test conversion to non UTF-8 as well
Rename t3900 test vector file
UTF-8: introduce i18n.logoutputencoding.
Teach log family --encoding
i18n.logToUTF8: convert commit log message to UTF-8
Move encoding conversion routine out of mailinfo to utf8.c
Conflicts:
commit.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6452a8be14..178e0e1e20 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -267,6 +267,10 @@ i18n.commitEncoding:: browser (and possibly at other places in the future or in other porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'. +i18n.logOutputEncoding:: + Character encoding the commit messages are converted to when + running `git-log` and friends. + log.showroot:: If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. |