On Fri, Jan 22, 2021 at 9:39 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > *1* subtree merging of gitk and git-gui, for an example, and having > an octopus merge in the history is another. This is probably quite off topic for the thread, but I'm curious why you think it was a bad idea to have octopus merges in git.git's history (there seem to be 37 of them).