On Mon, Jul 31, 2023 at 03:44:02PM -0700, Junio C Hamano wrote: > Documentation/git-checkout.txt | 9 ++- > Documentation/git-restore.txt | 4 ++ > builtin/checkout.c | 15 +++-- > builtin/update-index.c | 98 ++++---------------------------- > rerere.c | 2 +- > resolve-undo.c | 101 ++++++++++++--------------------- > resolve-undo.h | 5 +- > t/t2030-unresolve-info.sh | 45 +++++++++++++-- > t/t2070-restore.sh | 71 ++++++++++++++++++++++- > t/t7201-co.sh | 47 +++++++++++++++ > 10 files changed, 230 insertions(+), 167 deletions(-) I am not so familiar with this area, so take my review with a healthy grain of salt, but this all LGTM. Thanks, Taylor
