From: Torsten Bögershausen <tboegi@xxxxxx> RFC patch: convert files from e.g. UTF-16 into UTF-8 while running "git diff". The diff must be called with "git diff --UTF-8" and the "encoding" attribute must be set for the file(s). The commit messages may need some improvements, and a closer look at diff.c, how command line options are forwared, is appreciated. It may even be possible to integrate t4066 somewhere... Torsten Bögershausen (2): convert_to_git(): checksafe becomes an integer git diff: Allow to reencode into UTF-8 Documentation/diff-options.txt | 4 ++ Documentation/gitattributes.txt | 9 +++++ apply.c | 4 +- convert.c | 60 +++++++++++++++++++++++----- convert.h | 20 +++++----- diff.c | 40 +++++++++++++++++-- diff.h | 1 + diffcore.h | 3 ++ environment.c | 2 +- sha1_file.c | 6 +-- t/t4066-diff-encoding.sh | 86 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 205 insertions(+), 30 deletions(-) create mode 100755 t/t4066-diff-encoding.sh -- 2.15.1.271.g1a4e40aa5d