diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-03 11:08:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-03 11:08:13 -0800 |
| commit | a751e79acaf5a02cc24fa6b0b2656e13c57ad803 (patch) | |
| tree | 3bf8a7611463cb61ce1723b569119a22a2ea3039 /add-interactive.c | |
| parent | f19f1b6cf37d22cf317b5c3b52a11eede1abe267 (diff) | |
| parent | 417b181f99ce53f50dea6541430cfe1f1f359a6a (diff) | |
| download | git-a751e79acaf5a02cc24fa6b0b2656e13c57ad803.tar.xz | |
Merge branch 'aa/add-p-no-auto-advance'
"git add -p" learned a new mode that allows the user to revisit a
file that was already dealt with.
* aa/add-p-no-auto-advance:
add-patch: allow interfile navigation when selecting hunks
add-patch: allow all-or-none application of patches
add-patch: modify patch_update_file() signature
interactive -p: add new `--auto-advance` flag
Diffstat (limited to 'add-interactive.c')
| -rw-r--r-- | add-interactive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/add-interactive.c b/add-interactive.c index 95ec5a89f8..1580639682 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -64,6 +64,7 @@ void init_add_i_state(struct add_i_state *s, struct repository *r, s->r = r; s->context = -1; s->interhunkcontext = -1; + s->auto_advance = add_p_opt->auto_advance; s->use_color_interactive = check_color_config(r, "color.interactive"); @@ -1017,6 +1018,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps, struct add_p_opt add_p_opt = { .context = s->context, .interhunkcontext = s->interhunkcontext, + .auto_advance = s->auto_advance }; struct strvec args = STRVEC_INIT; struct pathspec ps_selected = { 0 }; |