git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] doc: clarify the intent of the renormalize option in the merge machinery

From
Torsten Bögershausen <tboegi@web.de>
Date
Feb 12, 2025, 06:18 UTC
Message-ID
<20250212061819.GB990@tb-raspi4>
In-Reply-To
<pull.1861.git.1739307712372.gitgitgadget@gmail.com>
On Tue, Feb 11, 2025 at 09:01:52PM +0000, Elijah Newren via GitGitGadget wrote:
Show 25 quoted lines
> From: Elijah Newren <newren@gmail.com>
>
> The -X renormalize (or merge.renormalize config) option is intended to
> reduce conflicts due to normalization of newer versions of history.  It
> does so by renormalizing files that it is about to do a three-way
> content merge on.  Some folks thought it would renormalize all files
> throughout the tree, and the previous wording wasn't clear enough to
> dispell that misconception.  Update the docs to make it clear that the
> merge machinery will only apply renormalization to files which need a
> three-way content merge.
>
> (Technically, the merge machinery also does renormalization on
> modify/delete conflicts, in order to see if the modification was merely
> a normalization; if so, it can accept the delete and not report a
> conflict.  But it's not clear that this piece needs to be explained to
> users, and trying to distinguish it might feel like splitting hairs and
> overcomplicating the explanation, so we leave it out.)
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>     doc: clarify the intent of the renormalize option in the merge machinery
>
>     cf.
>     https://lore.kernel.org/git/CABPp-BGQ0pc=AZ0fdXcqDbhMLbm2xBvi71g0mXAVDagz19NkEg@mail.gmail.com/
>     and the thread there

My first impression after reading this: Thanks, that makes sense. The second one: Do we need to explain how a merge works here in this part of the documenatation ?

The third round after re-reading and re-thinking:
Yes, this makes sense and lloks good.
Previous: Elijah Newren via GitGitGadget
Message 2 of 2 in “doc: clarify the intent of the renormalize option in the merge machinery”
  1. doc: clarify the intent of the renormalize option in the merge machineryElijah Newren via GitGitGadget, Feb 11, 2025
  2. Torsten BögershausenFeb 12, 2025

Read the whole thread, see it on lore, or plain text.

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