]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dd/sequencer-utf8'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:36 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:36 +0000 (09:04 -0800)
Handling of commit objects that use non UTF-8 encoding during
"rebase -i" has been improved.

* dd/sequencer-utf8:
  sequencer: reencode commit message for am/rebase --show-current-patch
  sequencer: reencode old merge-commit message
  sequencer: reencode squashing commit's message
  sequencer: reencode revert/cherry-pick's todo list
  sequencer: reencode to utf-8 before arrange rebase's todo list
  t3900: demonstrate git-rebase problem with multi encoding
  configure.ac: define ICONV_OMITS_BOM if necessary
  t0028: eliminate non-standard usage of printf

1  2 
configure.ac
sequencer.c

diff --cc configure.ac
Simple merge
diff --cc sequencer.c
Simple merge