diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-15 16:09:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-15 16:09:46 -0700 |
| commit | b7f39a3fe6c5e81680594975914106650136eb0b (patch) | |
| tree | fbfa9e978f6f2aa93e34306f04d2b0243f179984 | |
| parent | Merge branch 'js/typofix' (diff) | |
| parent | add -p: fix worktree patch mode prompts (diff) | |
| download | git-b7f39a3fe6c5e81680594975914106650136eb0b.tar.gz git-b7f39a3fe6c5e81680594975914106650136eb0b.zip | |
Merge branch 'rs/add-p-worktree-mode-prompt-fix'
Fix another UI regression in the reimplemented "add -p".
* rs/add-p-worktree-mode-prompt-fix:
add -p: fix worktree patch mode prompts
| -rw-r--r-- | add-patch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/add-patch.c b/add-patch.c index 29f9456df3..33ecd8398a 100644 --- a/add-patch.c +++ b/add-patch.c @@ -191,10 +191,10 @@ static struct patch_mode patch_mode_worktree_head = { .apply_check_args = { "-R", NULL }, .is_reverse = 1, .prompt_mode = { - N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), + N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "), + N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "), + N_("Discard addition from worktree [y,n,q,a,d%s,?]? "), + N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "), }, .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " "will immediately be marked for discarding."), @@ -213,10 +213,10 @@ static struct patch_mode patch_mode_worktree_nothead = { .apply_args = { NULL }, .apply_check_args = { NULL }, .prompt_mode = { - N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), + N_("Apply mode change to worktree [y,n,q,a,d%s,?]? "), + N_("Apply deletion to worktree [y,n,q,a,d%s,?]? "), + N_("Apply addition to worktree [y,n,q,a,d%s,?]? "), + N_("Apply this hunk to worktree [y,n,q,a,d%s,?]? "), }, .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " "will immediately be marked for applying."), |