diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | afea77a72a2e986dfa285b86c08ba51772579dad (patch) | |
| tree | b274bc7df610b311e50026f74d3fc9f0428c40bd | |
| parent | rebase: help users when dying with `preserve-merges` (diff) | |
| download | git-afea77a72a2e986dfa285b86c08ba51772579dad.tar.gz git-afea77a72a2e986dfa285b86c08ba51772579dad.zip | |
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 <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 3 insertions, 1 deletions
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, |