git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-26 03:51:40 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

rebase: preserve is also a pull option, tell dying users

Browse Source 
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>
This commit is contained in:
Philip Oakley
2022-02-21 22:56:10 +00:00
committed by Victoria Dye
parent ccfd176ed7
commit 6cabbcb05a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/rebase.c
View File

@@ -1207,7 +1207,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,