diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:30 -0800 |
| commit | 0eb5ebc1d862737ea2b313d0d77d120b3d114099 (patch) | |
| tree | 86953ccb34217f1dfab70061373ac2187aa3f924 /Documentation | |
| parent | 7429ed2bad6297f0aef921b83083c572975fde71 (diff) | |
| parent | 69cd8f63427c65c65d9cd66bb8c05ca93dc3edef (diff) | |
| download | git-0eb5ebc1d862737ea2b313d0d77d120b3d114099.tar.gz git-0eb5ebc1d862737ea2b313d0d77d120b3d114099.tar.xz | |
Merge branch 'ag/blame-encoding'
* ag/blame-encoding:
builtin-blame: Reencode commit messages according to git-log rules.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/blame-options.txt | 7 | ||||
| -rw-r--r-- | Documentation/i18n.txt | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 5428111d7..1ab1b96cf 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. diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt index d2970f835..2cdacd94c 100644 --- a/Documentation/i18n.txt +++ b/Documentation/i18n.txt @@ -37,9 +37,9 @@ of `i18n.commitencoding` in its `encoding` header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8. -. 'git-log', 'git-show' and friends looks at the `encoding` - header of a commit object, and tries to re-code the log - message into UTF-8 unless otherwise specified. You can +. 'git-log', 'git-show', 'git-blame' and friends look at the + `encoding` header of a commit object, and try to re-code the + log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with `i18n.logoutputencoding` in `.git/config` file, like this: + |