From: Philip Oakley Date: Sat, 4 Jun 2022 11:17:48 +0000 (+0000) Subject: rebase: note `preserve` merges may be a pull config option X-Git-Tag: v2.37.0-rc1~14^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afea77a72a2e986dfa285b86c08ba51772579dad;p=thirdparty%2Fgit.git rebase: note `preserve` merges may be a pull config option 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/rebase.c b/builtin/rebase.c index a3bae89f64..142a40fa99 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1207,7 +1207,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,