diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-04 22:20:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-04 22:20:13 +0300 |
| commit | 99c7db563fb12b053aaa2b4d7556f979c4883ea1 (patch) | |
| tree | b4ddec961575e1ef4d6feb8cac37ff65f92785c9 /Documentation | |
| parent | af6d1d602a8f64164b266364339c4e936d5bbc33 (diff) | |
| parent | 9e8fe7b1c789fee4b7d0b219180cd26de80d730e (diff) | |
Merge branch 'jk/log-warn-on-bogus-encoding' into maint
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.txt | 4 |
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:: |