From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-5.5 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 EE7D720195 for ; Tue, 12 Jul 2016 21:27:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751335AbcGLV10 (ORCPT ); Tue, 12 Jul 2016 17:27:26 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:53637 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750816AbcGLV1Z (ORCPT ); Tue, 12 Jul 2016 17:27:25 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id C1606299B4; Tue, 12 Jul 2016 17:27:18 -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=JAOV/m6GXloe9xESm7vATfZIAwE=; b=O3Jk/i h+F9x1nsDs4lGwcE7rVJNrDtz3XWFTlKWh25gGQcGMI6krTHls1hhGQHcyRKRN8c BHksmShNFzSoVQPqWwFygLuUdG2UJaFDYR7VQZvLTDoFV//SHwq9Xb2byj4MGCVr Kd6q4YQLSFpWLbvmZkF82dA94+Mx7WmA6x1co= 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=V9IxbfDiFgvUFf/G9LSDkGTO7NUYrI6d CdWj95+JAbLkXTAPsWSembrSEK2/ov2Rj2IOxGxt+HV3mfWcNh56iL8kmeTZ9TS4 WYHwoUO065eB0nBA/hqNZ4nj61M5a0Vau+fHkncHYFEnVLeIVwuneeZhbAI11eqn 5TMLDYKZ0zI= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id B7DFE299B3; Tue, 12 Jul 2016 17:27:18 -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 3C221299B2; Tue, 12 Jul 2016 17:27:18 -0400 (EDT) From: Junio C Hamano To: Johannes Schindelin Cc: git@vger.kernel.org, Eric Sunshine , Jeff King , Johannes Sixt , Duy Nguyen , Jakub =?utf-8?Q?Nar=C4=99bski?= Subject: Re: [PATCH v3 00/16] Use merge_recursive() directly in the builtin am References: Date: Tue, 12 Jul 2016 14:27:16 -0700 In-Reply-To: (Johannes Schindelin's message of "Thu, 7 Jul 2016 16:35:06 +0200 (CEST)") Message-ID: 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: 691D3EB6-4877-11E6-B102-89D312518317-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Schindelin writes: > This is the second iteration of the long-awaited re-roll of the attempt to > avoid spawning merge-recursive from the builtin am and use merge_recursive() > directly instead. This is actually the third iteration. I am trying to tease dependencies apart and apply this on a more reasonable base than a commit that happened to be at 'pu' on one day, but this would probably take some time, and I may give up merging it anywhere for today's integration cycle. We'll see.