All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
	 git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
	 Eric Sunshine <sunshine@sunshineco.com>,
	 Taylor Blau <me@ttaylorr.com>
Subject: Re: [PATCH v2 0/1] Object ID support for git merge-file
Date: Tue, 31 Oct 2023 09:03:28 +0900	[thread overview]
Message-ID: <xmqqttq78xpr.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BF6vxU5x5VLGbRhtcTBqDu3x31=vMOd2bimZNg2mkkvuA@mail.gmail.com> (Elijah Newren's message of "Mon, 30 Oct 2023 10:15:10 -0700")

Elijah Newren <newren@gmail.com> writes:

> On Mon, Oct 30, 2023 at 9:27 AM brian m. carlson
> <sandals@crustytoothpaste.net> 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(-)
>
> Thanks, this version looks good to me.

Thanks, both.  Will queue.

  reply	other threads:[~2023-10-31  0:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-24 19:56 [PATCH 0/1] Object ID support for git merge-file brian m. carlson
2023-10-24 19:56 ` [PATCH 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-24 20:12   ` Eric Sunshine
2023-10-24 21:23     ` brian m. carlson
2023-10-29  6:17   ` Elijah Newren
2023-10-29 10:12     ` Phillip Wood
2023-10-30 16:14       ` brian m. carlson
2023-10-29 14:18     ` brian m. carlson
2023-10-30 16:39       ` Elijah Newren
2023-10-29  6:24 ` [PATCH 0/1] Object ID support for git merge-file Elijah Newren
2023-10-29 10:15   ` Phillip Wood
2023-10-30 15:54   ` Taylor Blau
2023-10-30 16:24     ` brian m. carlson
2023-10-30 17:14       ` Elijah Newren
2023-10-30 16:26 ` [PATCH v2 " brian m. carlson
2023-10-30 16:26   ` [PATCH v2 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-31 21:48     ` Martin Ågren
2023-10-31 22:31       ` brian m. carlson
2023-11-01  3:44         ` Junio C Hamano
2023-11-01 19:16           ` brian m. carlson
2023-10-30 17:15   ` [PATCH v2 0/1] Object ID support for git merge-file Elijah Newren
2023-10-31  0:03     ` Junio C Hamano [this message]
2023-10-31 11:05   ` Phillip Wood
2023-10-31 23:06     ` Junio C Hamano
2023-11-01 19:24 ` [PATCH v3 0/2] " brian m. carlson
2023-11-01 19:24   ` [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders brian m. carlson
2023-11-01 23:53     ` Junio C Hamano
2023-11-02  8:53       ` Martin Ågren
2023-11-02  9:18         ` brian m. carlson
2023-11-02  9:29           ` Martin Ågren
2023-11-02 16:28         ` Junio C Hamano
2023-11-01 19:24   ` [PATCH v3 2/2] merge-file: add an option to process object IDs brian m. carlson
2023-11-02  8:51     ` Martin Ågren
2023-11-01 23:55   ` [PATCH v3 0/2] Object ID support for git merge-file Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqttq78xpr.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=me@ttaylorr.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.