From: Phillip Wood <phillip.wood123@gmail.com>
Date: Tue, 31 Oct 2023 11:05:12 GMT
Subject: Re: [PATCH v2 0/1] Object ID support for git merge-file
Message-ID: <6a8f3a6c-c3b0-4aff-ab36-be980ec6bbe0@gmail.com>
In-Reply-To: <20231030162658.567523-1-sandals@crustytoothpaste.net>

Hi brian

Thanks for the re-roll, this version looks good to me

Phillip

On 30/10/2023 16:26, brian m. carlson wrote:
> This series introduces an --object-id option to git merge-file such
> that, instead of reading and writing from files on the system, it reads
> from and writes to the object store using blobs.
> 
> Changes from v1:
> * Improve error handling
> * Re-add `-p` argument for documentation
> 
> brian m. carlson (1):
>    merge-file: add an option to process object IDs
> 
>   Documentation/git-merge-file.txt | 20 +++++++++++
>   builtin/merge-file.c             | 62 +++++++++++++++++++++++---------
>   t/t6403-merge-file.sh            | 58 ++++++++++++++++++++++++++++++
>   3 files changed, 124 insertions(+), 16 deletions(-)
> 
>