]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'aa/add-p-no-auto-advance'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2026 19:08:13 +0000 (11:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2026 19:08:13 +0000 (11:08 -0800)
"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

1  2 
add-interactive.c
add-patch.c
builtin/checkout.c
builtin/reset.c
builtin/stash.c
t/t3701-add-interactive.sh
t/t9902-completion.sh

Simple merge
diff --cc add-patch.c
Simple merge
Simple merge
diff --cc builtin/reset.c
Simple merge
diff --cc builtin/stash.c
Simple merge
Simple merge
Simple merge