summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-29 15:43:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-29 15:43:15 -0700
commita31efa77c641ed3a71f6445da93f623351afb76e (patch)
tree10d2307330fd1cefd628db7fad158763ebc630c1 /Documentation
parentMerge branch 'ab/unbundle-progress' (diff)
parentlog: document --encoding behavior on iconv() failure (diff)
downloadtgif-a31efa77c641ed3a71f6445da93f623351afb76e.tar.xz
Merge branch 'jk/log-warn-on-bogus-encoding'
Squelch over-eager warning message added during this cycle. * jk/log-warn-on-bogus-encoding: log: document --encoding behavior on iconv() failure Revert "logmsg_reencode(): warn when iconv() fails"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index b3af850608..dc685be363 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -41,8 +41,8 @@ people using 80-column terminals.
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. Likewise, if iconv(3) fails
- to convert the commit, we will output the original object
- verbatim, along with a warning.
+ to convert the commit, we will quietly output the original
+ object verbatim.
--expand-tabs=<n>::
--expand-tabs::