From: Jeff King Date: Tue, 31 Jul 2018 20:40:13 GMT Subject: Re: git merge -s subtree seems to be broken. Message-ID: <20180731204012.GB9442@sigill.intra.peff.net> In-Reply-To: On Tue, Jul 31, 2018 at 03:52:26PM -0400, George Shammas wrote: > This is the fastest I ever seen an open source project respond to an issue > I reported. Thanks for being awesome! You're welcome. My speed is an inverse to how embarrassingly long we carried the bug for. ;) > > Signed-off-by: Jeff King > > --- > > match-trees.c | 43 ++++++++++++++++++++++++++----------------- > > 1 file changed, 26 insertions(+), 17 deletions(-) Sorry, I meant to actually add a: Reported-by: George Shammas here. -Peff