Merge branch 'ab/rebase-fatal-fatal-fix'
Error message fix. * ab/rebase-fatal-fatal-fix: rebase: emit one "fatal" in "fatal: fatal: <error>"
This commit is contained in:
commit
31e4a0db03
@ -1918,7 +1918,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||||||
&options.orig_head))
|
&options.orig_head))
|
||||||
options.head_name = NULL;
|
options.head_name = NULL;
|
||||||
else
|
else
|
||||||
die(_("fatal: no such branch/commit '%s'"),
|
die(_("no such branch/commit '%s'"),
|
||||||
branch_name);
|
branch_name);
|
||||||
} else if (argc == 0) {
|
} else if (argc == 0) {
|
||||||
/* Do not need to switch branches, we are already on it. */
|
/* Do not need to switch branches, we are already on it. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user