From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: GitHub Chris Idema <github_chris_idema@proton.me>,
git@vger.kernel.org, Michael Lutz <michi@icosahedron.de>,
Pat Thoyts <patthoyts@users.sourceforge.net>,
Chris Idema via GitGitGadget <gitgitgadget@gmail.com>
Subject: Re: [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces.
Date: Thu, 29 Jan 2026 07:17:20 -0800 [thread overview]
Message-ID: <xmqqikckcutb.fsf@gitster.g> (raw)
In-Reply-To: <7f45bdc4-d164-42e4-8a84-36410654b4e0@kdbg.org> (Johannes Sixt's message of "Thu, 29 Jan 2026 11:04:46 +0100")
Johannes Sixt <j6t@kdbg.org> writes:
> Am 29.01.26 um 09:31 schrieb GitHub Chris Idema:
>>> From: Junio C Hamano <gitster@pobox.com>
>>> I noticed that gitk has code to deal with octopus merges
>>
>> I would love to know how such a merge can be replicated.
>> Is it also possible to have such a merge visible in Git Gui?
> This case is not relevant for Git GUI, because it can only show what is
> in the index. We have only "theirs" and "ours", and together with the
> current file contents that's a 3-way diff.
OK. If it does not show existing merge commits, then I agree that
only 3-way is relevant. Thanks for a clarification.
next prev parent reply other threads:[~2026-01-29 15:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 10:45 [PATCH] diff.tcl: fixed alignment of tabs in git-gui diff by using spaces Chris Idema via GitGitGadget
2026-01-26 12:15 ` Johannes Sixt
2026-01-26 13:32 ` GitHub Chris Idema
2026-01-26 13:59 ` Johannes Sixt
2026-01-26 14:43 ` GitHub Chris Idema
2026-01-26 14:52 ` Johannes Sixt
2026-01-26 15:21 ` GitHub Chris Idema
2026-01-26 15:32 ` GitHub Chris Idema
2026-01-27 20:33 ` [PATCH/RFC v2 0/2] diff.tcl: Fixed " Chris Idema via GitGitGadget
2026-01-27 20:33 ` [PATCH/RFC v2 1/2] diff.tcl: fixed " Chris Idema via GitGitGadget
2026-01-27 20:33 ` [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces Chris Idema via GitGitGadget
2026-01-27 22:19 ` Junio C Hamano
2026-01-27 23:26 ` Junio C Hamano
2026-01-28 9:07 ` GitHub Chris Idema
2026-01-28 13:40 ` Johannes Sixt
2026-01-28 14:02 ` GitHub Chris Idema
2026-01-28 15:59 ` Johannes Sixt
2026-01-28 23:42 ` Junio C Hamano
2026-01-29 0:06 ` Junio C Hamano
2026-01-29 8:31 ` GitHub Chris Idema
2026-01-29 10:04 ` Johannes Sixt
2026-01-29 15:17 ` Junio C Hamano [this message]
2026-01-28 10:20 ` [PATCH/RFC v3] diff.tcl: made alignment of tabs in git-gui diff consistent with gitk Chris Idema via GitGitGadget
2026-01-28 17:02 ` Johannes Sixt
2026-01-28 19:02 ` GitHub Chris Idema
2026-01-29 0:02 ` Junio C Hamano
2026-01-29 11:09 ` [PATCH v4] git-gui: shift tabstops to account for the first column of context diffs Chris Idema via GitGitGadget
2026-01-29 21:36 ` Johannes Sixt
2026-03-04 13:32 ` GitHub Chris Idema
2026-03-04 19:22 ` Johannes Sixt
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=xmqqikckcutb.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=github_chris_idema@proton.me \
--cc=j6t@kdbg.org \
--cc=michi@icosahedron.de \
--cc=patthoyts@users.sourceforge.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox