Re: [PATCH 0/7] unresolve removal

From: Taylor Blau <me@ttaylorr.com>
Date: Aug 4, 2023, 19:03 UTC
Message-ID: <ZM1LbVp74cqpqQ0A@nand.local>
In-Reply-To: <20230731224409.4181277-1-gitster@pobox.com>

On Mon, Jul 31, 2023 at 03:44:02PM -0700, Junio C Hamano wrote:

Show 11 quoted lines

>  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