mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/rebase-helper'
Recent update to "rebase -i" started showing a message that is not a warning with "warning:" prefix by mistake. This has been fixed. * js/rebase-helper: sequencer: drop "warning:" when stopping for edit
This commit is contained in:
commit
434a7764ba
|
@ -1997,7 +1997,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
if (item->command == TODO_EDIT) {
|
||||
struct commit *commit = item->commit;
|
||||
if (!res)
|
||||
warning(_("stopped at %s... %.*s"),
|
||||
fprintf(stderr,
|
||||
_("Stopped at %s... %.*s"),
|
||||
short_commit_name(commit),
|
||||
item->arg_len, item->arg);
|
||||
return error_with_patch(commit,
|
||||
|
|
Loading…
Reference in a new issue