From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <git-owner@vger.kernel.org>
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.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,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 7B2281F8C6
	for <e@yhbt.net>; Wed,  4 Aug 2021 00:21:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234358AbhHDAVS (ORCPT <rfc822;e@yhbt.net>);
        Tue, 3 Aug 2021 20:21:18 -0400
Received: from pb-smtp1.pobox.com ([64.147.108.70]:54603 "EHLO
        pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S233759AbhHDAVR (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 3 Aug 2021 20:21:17 -0400
Received: from pb-smtp1.pobox.com (unknown [127.0.0.1])
        by pb-smtp1.pobox.com (Postfix) with ESMTP id 38036D7BC8;
        Tue,  3 Aug 2021 20:21:05 -0400 (EDT)
        (envelope-from junio@pobox.com)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; s=sasl; bh=mpLkYNcOLu4iHXTt44AYxp49Q+k6wazLjictSm
        2kF3k=; b=MuVawx72tspPDFK75Q4fd+iFkjkiql5/xs+Z+Gj5C9u/KkElvew79l
        YtjJuMEr1ll+CX7O8R7nwdJK94oIG2ndldvbF3b6CNy/JaSW/7DQcE9Uavz3P6z0
        xemZGehL2HPEBnUldzeTkT7DY8I5vvJP0eN3t3SnisVIaYNzdYQmU=
Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1])
        by pb-smtp1.pobox.com (Postfix) with ESMTP id 2E9CED7BC6;
        Tue,  3 Aug 2021 20:21:05 -0400 (EDT)
        (envelope-from junio@pobox.com)
Received: from pobox.com (unknown [35.196.71.182])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 9CA7AD7BC5;
        Tue,  3 Aug 2021 20:21:04 -0400 (EDT)
        (envelope-from junio@pobox.com)
From:   Junio C Hamano <gitster@pobox.com>
To:     "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc:     git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 05/10] merge-strategies.txt: do not imply using copy
 detection is desired
References: <pull.1059.git.git.1628004920.gitgitgadget@gmail.com>
        <5f974afe47ce46521f6c51484d1ebd59cd7339dd.1628004920.git.gitgitgadget@gmail.com>
Date:   Tue, 03 Aug 2021 17:21:04 -0700
In-Reply-To: <5f974afe47ce46521f6c51484d1ebd59cd7339dd.1628004920.git.gitgitgadget@gmail.com>
        (Elijah Newren via GitGitGadget's message of "Tue, 03 Aug 2021
        15:35:15 +0000")
Message-ID: <xmqqim0mrrf3.fsf@gitster.g>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Pobox-Relay-ID: DB13BF60-F4B9-11EB-8A64-8B3BC6D8090B-77302942!pb-smtp1.pobox.com
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> -	renames, but currently cannot make use of detected
> -	copies.  This is the default merge strategy when pulling
> -	or merging one branch.
> +	renames.  It does not make use of detected copies.  This
> +	is the default merge strategy when pulling or merging one
> +	branch.

Good use of "does not"; we do not and we should not say "cannot"
here.