From: Philip Oakley <philipoakley@iee.email>
The `--preserve-merges` option was removed by v2.35.0. However
users may not be aware that it is also a Pull option, and it is
still offered by major IDE vendors such as Visual Studio.
Extend the `--preserve-merges` die message to direct users to
this option and it's locations.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
builtin/rebase.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 07221d0ae41..97f704bb297 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1205,7 +1205,10 @@ 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"
+ "Also, check your `pull` configuration settings\n"
+ "`git config --show-scope --show-origin --get-regexp 'pull.*'`\n"
+ "which may also invoke this option."));
if (action != ACTION_NONE && total_argc != 2) {
usage_with_options(builtin_rebase_usage,
--
gitgitgadget
