From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <git-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: AS31976 209.132.180.0/23
X-Spam-Status: No, score=-7.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,
	RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by dcvr.yhbt.net (Postfix) with ESMTP id 755B02018A
	for <e@80x24.org>; Fri,  1 Jul 2016 16:03:12 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752025AbcGAQDI (ORCPT <rfc822;e@80x24.org>);
	Fri, 1 Jul 2016 12:03:08 -0400
Received: from pb-smtp1.pobox.com ([64.147.108.70]:54313 "EHLO
	sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750803AbcGAQDH (ORCPT <rfc822;git@vger.kernel.org>);
	Fri, 1 Jul 2016 12:03:07 -0400
Received: from sasl.smtp.pobox.com (unknown [127.0.0.1])
	by pb-smtp1.pobox.com (Postfix) with ESMTP id 0CFF92779E;
	Fri,  1 Jul 2016 12:03:06 -0400 (EDT)
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc
	:subject:references:date:in-reply-to:message-id:mime-version
	:content-type; s=sasl; bh=pgUgSGbW5WxVHmgFNv/pebX76Jg=; b=wNk2K5
	oGWRlvL944VvFfip3Nb5+BqRtlMMR9hAuBdT1YwQne5MA+l1dVnfUBme6cEEO9jH
	M4bUedCVU5rj4gBf1icOvkZxBzKz4sTEw9sIfHwZgmDEkdmu+zrL/qNRtEQ6KIVn
	8FXrz13pLjjC+MWrH/LQWiPOtbH4F9rSBUaDE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
	:subject:references:date:in-reply-to:message-id:mime-version
	:content-type; q=dns; s=sasl; b=Jgz3vhQzniIh5+sNHqpWPqy/bndPKd/H
	GzZfSkHDkCUl7s5eLIUWoKi90fgKb7XPLaa+dRts6fyXakraWF4qGrdeO44S69Kd
	EmZtX9Z5zTvNzNPMsZ4GVYvOmqNLtsKvkpvpp4zza0Ckku2qnnElALkYHJC7bccx
	9cFid5Mhdbw=
Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1])
	by pb-smtp1.pobox.com (Postfix) with ESMTP id 051672779C;
	Fri,  1 Jul 2016 12:03:06 -0400 (EDT)
Received: from pobox.com (unknown [104.132.0.95])
	(using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 7647327799;
	Fri,  1 Jul 2016 12:03:05 -0400 (EDT)
From:	Junio C Hamano <gitster@pobox.com>
To:	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc:	git@vger.kernel.org
Subject: Re: [PATCH 9/9] am: make a direct call to merge_recursive
References: <cover.1467199553.git.johannes.schindelin@gmx.de>
	<dc58115e23c8d942b3ff6270b43719bc841becbb.1467199553.git.johannes.schindelin@gmx.de>
	<xmqqpoqz51o8.fsf@gitster.mtv.corp.google.com>
	<alpine.DEB.2.20.1606301026360.12947@virtualbox>
Date:	Fri, 01 Jul 2016 09:03:03 -0700
In-Reply-To: <alpine.DEB.2.20.1606301026360.12947@virtualbox> (Johannes
	Schindelin's message of "Thu, 30 Jun 2016 10:38:44 +0200 (CEST)")
Message-ID: <xmqqtwg9z6q0.fsf@gitster.mtv.corp.google.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Pobox-Relay-ID: 4BC896CE-3FA5-11E6-AE2F-89D312518317-77302942!pb-smtp1.pobox.com
Sender:	git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List:	git@vger.kernel.org

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Wed, 29 Jun 2016, Junio C Hamano wrote:
>
>> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>> 
>> > From: Junio C Hamano <gitster@pobox.com>
>> 
>> Did I write this thing?
>
> Yes, you did. It was db05d6194d3f9ea9e64163944961d5f6e85302be as part of
> pu@{2016-06-15}.

Ah, OK, that is quite old, dating from Oct 2015.  Thanks for a
pointer.