[PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option
- From
Philip Oakley via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jun 4, 2022, 11:17 UTC
- Message-ID
- <fe000f062078e544361c87c319830cd36aabbc91.1654341469.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1242.v2.git.1654341469.gitgitgadget@gmail.com>
From: Philip Oakley <philipoakley@iee.email>
The `--preserve-merges` option was removed by v2.34.0. However users may not be aware that it is also a Pull configuration option, which is still offered by major IDE vendors such as Visual Studio.
Extend the `--preserve-merges` die message to also direct users to the possible use of the `preserve` option in the `pull.rebase` config. This is an additional 'belt and braces' information statement.
Signed-off-by: Philip Oakley <philipoakley@iee.email> --- builtin/rebase.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c index 17cc776b4b1..5f8921551e1 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1205,7 +1205,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) builtin_rebase_usage, 0); if (preserve_merges_selected) - die(_("--preserve-merges was replaced by --rebase-merges")); + die(_("--preserve-merges was replaced by --rebase-merges\n" + "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" + "which is no longer supported; use 'merges' instead")); if (action != ACTION_NONE && total_argc != 2) { usage_with_options(builtin_rebase_usage,
-- gitgitgadget