]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/log-warn-on-bogus-encoding' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Nov 2021 19:20:13 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Nov 2021 19:20:13 +0000 (12:20 -0700)
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"


Trivial merge