]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/log-warn-on-bogus-encoding'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:15 +0000 (15:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:15 +0000 (15:43 -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"

1  2 
pretty.c

diff --cc pretty.c
Simple merge