Re: [PATCH v5 2/3] rebase: deprecate --rebase-merges=""

From: Calvin Wan <calvinwan@google.com>
Date: Mar 2, 2023, 18:02 UTC
Message-ID: <20230302180200.2698729-1-calvinwan@google.com>
In-Reply-To: <20230225180325.796624-3-alexhenrie24@gmail.com>

Show 6 quoted lines

> -			; /* default mode; do nothing */
> +			warning(_("--rebase-merges with an empty string "
> +				  "argument is deprecated and will stop "
> +				  "working in a future version of Git. Use "
> +				  "--rebase-merges=no-rebase-cousins "
> +				  "instead."));

Just a small nit on the warning message. It should describe to the user what behavior is happening here and presumably the user wanted `--rebase-merges` with no argument. For example, "Defaulting to --rebase-merges instead."

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