diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-11-13 20:28:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-14 21:38:11 -0800 |
| commit | a2df1fb2e52a49bf6b17b352581510efd851f337 (patch) | |
| tree | 9413cf9fb055824f425ae5d9769b667ae305ace4 /Documentation/gitattributes.txt | |
| parent | e1ca0defd2039aecd7b5a68ed653f8ec40cf509e (diff) | |
| download | git-a2df1fb2e52a49bf6b17b352581510efd851f337.tar.gz | |
Documentation: New GUI configuration and command-line options.
Add information on new git-gui and gitk command-line options,
configuration variables, and the encoding attribute.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index a172baf993..8af22eccac 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -535,6 +535,23 @@ in the file. E.g. the string `$Format:%H$` will be replaced by the commit hash. +Viewing files in GUI tools +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`encoding` +^^^^^^^^^^ + +The value of this attribute specifies the character encoding that should +be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to +display the contents of the relevant file. Note that due to performance +considerations linkgit:gitk[1] does not use this attribute unless you +manually enable per-file encodings in its options. + +If this attribute is not set or has an invalid value, the value of the +`gui.encoding` configuration variable is used instead +(See linkgit:git-config[1]). + + USING ATTRIBUTE MACROS ---------------------- |