We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent c27ae4f commit dcf2532Copy full SHA for dcf2532
1 file changed
sequencer.c
@@ -240,11 +240,8 @@ static int error_dirty_index(struct replay_opts *opts)
240
if (read_cache_unmerged())
241
return error_resolve_conflict(action_name(opts));
242
243
- /* Different translation strings for cherry-pick and revert */
244
- if (opts->action == REPLAY_PICK)
245
- error(_("Your local changes would be overwritten by cherry-pick."));
246
- else
247
- error(_("Your local changes would be overwritten by revert."));
+ error(_("Your local changes would be overwritten by %s."),
+ action_name(opts));
248
249
if (advice_commit_before_merge)
250
advise(_("Commit your changes or stash them to proceed."));
0 commit comments