"Kazuhiro Kato via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > fix: file name encoding issues. fix: when resolving merge conflicts, > japanese file names become garbled. > > Kazuhiro Kato (2): > Fixing file name encoding issues. > fix: when resolving merge conflicts, japanese file names become > garbled. > > gitk-git/gitk | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Please - base your changes to j6t's gitk repository https://github.com/j6t/gitk where the file your patch would touch should appear at the top level of the working tree. This "independent" history is then merged into my tree with "git pull -Xsubtree=gitk-git". - have the e-mail address of the gitk maintainer on the Cc: line, i.e. "Cc: Johannes Sixt <j6t@xxxxxxxx>". Thanks. cf. https://lore.kernel.org/git/b2038430-62dc-41fa-86c2-c0a14bd25e0f@xxxxxxxx/ https://lore.kernel.org/git/7b826bba-11cf-4f45-8292-937522dbaf29@xxxxxxxx/ https://lore.kernel.org/git/5ccc1943-c2a3-4896-a858-aa5fd6cdd426@xxxxxxxx/ > > > base-commit: bc204b742735ae06f65bb20291c95985c9633b7f > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1886%2Fkkato233%2Ffix_filename_encoding-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1886/kkato233/fix_filename_encoding-v1 > Pull-Request: https://github.com/git/git/pull/1886
