From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Sep 2021 18:46:30 +0000 (-0700)
Subject: Merge branch 'jk/log-warn-on-bogus-encoding'
X-Git-Tag: v2.34.0-rc0~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfe37f3dc5a7750dd77c571ada91112b4389ffae;p=thirdparty%2Fgit.git

Merge branch 'jk/log-warn-on-bogus-encoding'

Doc update plus improved error reporting.

* jk/log-warn-on-bogus-encoding:
  docs: use "character encoding" to refer to commit-object encoding
  logmsg_reencode(): warn when iconv() fails
---

bfe37f3dc5a7750dd77c571ada91112b4389ffae