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

Merge pull request #3708 from PhilipOakley/die_preserve

Browse Source 
Update the die() preserve-merges messages to help some users
This commit is contained in:
Johannes Schindelin
2022-02-22 10:57:27 +01:00
committed by Victoria Dye
parent c77e448aeb 6cabbcb05a
commit 48a6fa90e5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/rebase.c
View File

@@ -1183,7 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/rewritten", merge_dir());
if (is_directory(buf.buf)) {
die("`rebase -p` is no longer supported");
die("`rebase --preserve-merges` (-p) is no longer supported.\n"
"You still have a `.git/rebase-merge/rewritten` directory, \n"
"indicating a `rebase preserve-merge` is still in progress.\n");
} else {
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir());
@@ -1205,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,