Re: [PATCH v2 00/10] Documentation updates: merge-strategies

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 4, 2021, 06:12 UTC
Message-ID: <xmqqk0l1rb57.fsf@gitster.g>
In-Reply-To: <pull.1059.v2.git.git.1628054935.gitgitgadget@gmail.com>

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

Show 8 quoted lines

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

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