global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-01 13:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer: avoid completely different messages for different actions

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-02-24 14:57:22 +01:00
parent b49e67d0f2
commit c7c9dbaa04
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sequencer.c
View File

@@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
if (read_cache_unmerged())
return error_resolve_conflict(action_name(opts));
/* Different translation strings for cherry-pick and revert */
if (opts->action == REPLAY_PICK)
error(_("Your local changes would be overwritten by cherry-pick."));
else
error(_("Your local changes would be overwritten by revert."));
error(_("Your local changes would be overwritten by %s."),
action_name(opts));
if (advice_commit_before_merge)
advise(_("Commit your changes or stash them to proceed."));