From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 49D9E1F8C6 for ; Wed, 4 Aug 2021 14:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238794AbhHDO4h (ORCPT ); Wed, 4 Aug 2021 10:56:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234423AbhHDO4g (ORCPT ); Wed, 4 Aug 2021 10:56:36 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39E97C0613D5 for ; Wed, 4 Aug 2021 07:56:23 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id e186so737627iof.12 for ; Wed, 04 Aug 2021 07:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Qg+DEZmVy/hZ/sMIEv/4gHDIZCGTOACFslETUF4B/9k=; b=dA5LFJDPexfXHnSMY3bYR9W5GpuTrGvqM2PNaT3xWkOasyyJOGWJC8bdKtGUYCJZvM Z15HkK3TBvV2xU5O1AR5QqMNxtkicaCKXO2xgjSazefJqv+ws+1j8PG6squiJKv3+Lyr oo5flQu0WyS+IeOE2G79xxjfc5bi26jE7cqEEnOO9wDM4ATiqqj6sIxsTq6x33sC+4GA ZExeilUSrbsGpzDiAFyRM9rbBwelQpnoO+KZ7+W62BkqtApIpjhz8tXLfaWO+fi9NoMH 5VppFbDHIzWwsnkgIpKifOyzp/jY1WdJpGS5nAMKe/A4odtZOAe8EfXieFvg6J4Di8D1 VOqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Qg+DEZmVy/hZ/sMIEv/4gHDIZCGTOACFslETUF4B/9k=; b=WIJs93KQREw9KGhEw2DDnj6pG48Sn4rP0javKqqj2kRlHkm3IcvIKjGtte1Nb5EobX JixSX+dVu51fQfFNd0GnjYHY+5wtVxTxFh0atwqedl64ACnzuVB40fKLjMo0xvwxxpta 86FA6KzRACsiOB1JNWeKpv1Iu0Iwia6YXvyn+j8zkDeSRY9jLVaKLGA5uEAIhHhFH8/G Oi5gs865VR9dx4I1Ip65zo1jfJX+CXbukaP8xYPhabD+N0FFKt5kf48QAN1ALEWjbex6 cgN56N6zSgc5zVmlNkV2leCjzenxcOVAGxIVnev+IYMVQB9XlwruTjGWes5i7Wjf8xff FvHg== X-Gm-Message-State: AOAM533C5MdK7TdMsm8rSlz9MQVT9e3GoBgzqce6LHbp+eIyUW1Eo5mK bcGl3mXu9WoE63wJrtyU+QM= X-Google-Smtp-Source: ABdhPJzuKbeHmvbFpdsRq8a2zRq5pP6JN3jHLsgndWC3sW2mGB3MmSoinbJLUuOIWmVOIWux2+YAng== X-Received: by 2002:a05:6638:214d:: with SMTP id z13mr19911071jaj.113.1628088982593; Wed, 04 Aug 2021 07:56:22 -0700 (PDT) Received: from ?IPv6:2600:1700:e72:80a0:3da5:bc29:43f3:f85c? ([2600:1700:e72:80a0:3da5:bc29:43f3:f85c]) by smtp.gmail.com with ESMTPSA id q7sm1756077iow.12.2021.08.04.07.56.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Aug 2021 07:56:21 -0700 (PDT) Subject: Re: [PATCH v2 00/10] Documentation updates: merge-strategies To: Junio C Hamano , Elijah Newren via GitGitGadget Cc: git@vger.kernel.org, Eric Sunshine , Johannes Schindelin , Elijah Newren References: From: Derrick Stolee Message-ID: Date: Wed, 4 Aug 2021 10:56:20 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 8/4/2021 2:12 AM, Junio C Hamano wrote: > "Elijah Newren via GitGitGadget" writes: > >> Changes since v1: >> >> * Multiple tweaks suggested by Eric, Dscho, and Junio >> * Removed patch 7 explaining no-renames since that probably belongs in git >> diff --no-renames instead, and this series is about merge-strategies. >> * Inserted a new patch 8 that strikes some misleading or at least >> no-longer-important text from git-rebase.txt (due changes back in late >> 2006). > > Looking good. > Will queue, together with the "switch" patches on top. Chiming in to say I like this version, too. Thanks! -Stolee