|
|
|
@ -191,10 +191,10 @@ static struct patch_mode patch_mode_worktree_head = {
@@ -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 = {
@@ -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."), |
|
|
|
|