We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 6307041 commit e635d5cCopy full SHA for e635d5c
sequencer.c
@@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
229
if (read_cache_unmerged())
230
return error_resolve_conflict(action_name(opts));
231
232
- /* Different translation strings for cherry-pick and revert */
233
- if (opts->action == REPLAY_PICK)
234
- error(_("Your local changes would be overwritten by cherry-pick."));
235
- else
236
- error(_("Your local changes would be overwritten by revert."));
+ error(_("Your local changes would be overwritten by %s."),
+ action_name(opts));
237
238
if (advice_commit_before_merge)
239
advise(_("Commit your changes or stash them to proceed."));
0 commit comments