summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-10 14:17:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-10 14:17:54 -0700
commitbbddc516649d1bc8774b6991a6ac769c92e99369 (patch)
treeacfa4abaf726729abcdadfd3f54bf97f39762f30 /Documentation
parentMerge branch 'nd/dwim-wildcards-as-pathspecs' (diff)
parentdocs: clarify that --encoding can produce invalid sequences (diff)
downloadtgif-bbddc516649d1bc8774b6991a6ac769c92e99369.tar.xz
Merge branch 'jk/pretty-encoding-doc'
Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 74aa01a0ec..642af6e426 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -37,7 +37,10 @@ people using 80-column terminals.
in their encoding header; this option can be used to tell the
command to re-code the commit log message in the encoding
preferred by the user. For non plumbing commands this
- defaults to UTF-8.
+ defaults to UTF-8. Note that if an object claims to be encoded
+ in `X` and we are outputting in `X`, we will output the object
+ verbatim; this means that invalid sequences in the original
+ commit may be copied to the output.
--notes[=<ref>]::
Show the notes (see linkgit:git-notes[1]) that annotate the