From: Johannes Sixt Date: Fri, 13 Jul 2018 16:42:07 GMT Subject: Re: [PATCH 0/3] rebase -r: support octopus merges Message-ID: <8dbaefe4-778e-1e83-4beb-0261699cc483@kdbg.org> In-Reply-To: Am 12.07.2018 um 18:26 schrieb Junio C Hamano: > Johannes Schindelin writes: >> A much more meaningful measure would be: how many octopus merge commits >> have been pushed to GitHub in the past two weeks. I don't think I have the >> technical means to answer that question, though. > > It does not mean that misusing a feature is a good thing and should > be encouraged if many misguided people do so. Just recently I had to rebuild the version of git-gui that comes with Git 2.18.0 before it was released: https://github.com/j6t/git-gui-ng/commit/f07ae1d7f07b036d78a3d4706e6cb4102e623fb3 I think that an octopus merge is the right tool for the task. Am I misguided? -- Hannes