diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-10-21 22:55:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 23:09:34 +0200 |
| commit | 69cd8f63427c65c65d9cd66bb8c05ca93dc3edef (patch) | |
| tree | 6520e907a99f50404bf9ba8e151ceb6f06e72e5e /Documentation/blame-options.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | git-69cd8f63427c65c65d9cd66bb8c05ca93dc3edef.tar.xz git-69cd8f63427c65c65d9cd66bb8c05ca93dc3edef.zip | |
builtin-blame: Reencode commit messages according to git-log rules.
Currently git-blame outputs text from the commit messages
(e.g. the author name and the summary string) as-is, without
even providing any information about the encoding used for
the data. It makes interpreting the data in multilingual
environment very difficult.
This commit changes the blame implementation to recode the
messages using the rules used by other commands like git-log.
Namely, the target encoding can be specified through the
i18n.commitEncoding or i18n.logOutputEncoding options, or
directly on the command line using the --encoding parameter.
Converting the encoding before output seems to be more
friendly to the porcelain tools than simply providing the
value of the encoding header, and does not require changing
the output format.
If anybody needs the old behavior, it is possible to
achieve it by specifying --encoding=none.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/blame-options.txt')
| -rw-r--r-- | Documentation/blame-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 5428111d73..1ab1b96cf9 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -49,6 +49,13 @@ of lines before or after the line given by <start>. Show the result incrementally in a format designed for machine consumption. +--encoding=<encoding>:: + Specifies the encoding used to output author names + and commit summaries. Setting it to `none` makes blame + output unconverted data. For more information see the + discussion about encoding in the linkgit:git-log[1] + manual page. + --contents <file>:: When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. |