Re: [PATCH 05/10] merge-strategies.txt: do not imply using copy detection is desired

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 4, 2021, 00:21 UTC
Message-ID: <xmqqim0mrrf3.fsf@gitster.g>
In-Reply-To: <5f974afe47ce46521f6c51484d1ebd59cd7339dd.1628004920.git.gitgitgadget@gmail.com>

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

Show 6 quoted lines

> -	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.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.