From: Junio C Hamano <gitster@pobox.com>
To: "Kazuhiro Kato via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Kazuhiro Kato <kazuhiro.kato@hotmail.co.jp>,
Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH 0/2] gitk: Fixing file name encoding issues.
Date: Tue, 18 Feb 2025 14:52:17 -0800 [thread overview]
Message-ID: <xmqq7c5mj272.fsf@gitster.g> (raw)
In-Reply-To: <pull.1886.git.git.1739918546.gitgitgadget@gmail.com> (Kazuhiro Kato via GitGitGadget's message of "Tue, 18 Feb 2025 22:42:24 +0000")
"Kazuhiro Kato via GitGitGadget" <gitgitgadget@gmail.com> 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@kdbg.org>".
Thanks.
cf.
https://lore.kernel.org/git/b2038430-62dc-41fa-86c2-c0a14bd25e0f@kdbg.org/
https://lore.kernel.org/git/7b826bba-11cf-4f45-8292-937522dbaf29@kdbg.org/
https://lore.kernel.org/git/5ccc1943-c2a3-4896-a858-aa5fd6cdd426@kdbg.org/
>
>
> 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
prev parent reply other threads:[~2025-02-18 22:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 22:42 [PATCH 0/2] gitk: Fixing file name encoding issues Kazuhiro Kato via GitGitGadget
2025-02-18 22:42 ` [PATCH 1/2] " Kazuhiro Kato via GitGitGadget
2025-02-19 17:30 ` Konstantin Khomoutov
2025-02-19 18:02 ` Junio C Hamano
2025-02-18 22:42 ` [PATCH 2/2] fix: when resolving merge conflicts, japanese file names become garbled Kazuhiro Kato via GitGitGadget
2025-02-19 18:11 ` Junio C Hamano
2025-02-18 22:52 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7c5mj272.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=j6t@kdbg.org \
--cc=kazuhiro.kato@hotmail.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.