Re: [PATCH v5] git-apply: allow simultaneous --cached and --3way options

Subject: Re: [PATCH v5] git-apply: allow simultaneous --cached and --3way options
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Mon, 12 Apr 2021 11:26:31 -0700
Cc: Jerry Zhang <jerry@xxxxxxxxxx>, Git Mailing List <git@xxxxxxxxxxxxxxx>, ross@xxxxxxxxxx, Abraham Bachrach <abe@xxxxxxxxxx>, brian.kubisiak@xxxxxxxxxx
In-reply-to: <CABPp-BEmZrK9ambLHL=ryjRM22zqGn6vzc+2aGoy=x-Z3mwUdQ@mail.gmail.com> (Elijah Newren's message of "Mon, 12 Apr 2021 08:45:31 -0700")
References: <20210407180349.10173-1-jerry@skydio.com> <20210408021344.8053-1-jerry@skydio.com> <xmqqh7kgvr3i.fsf@gitster.g> <CABPp-BEmZrK9ambLHL=ryjRM22zqGn6vzc+2aGoy=x-Z3mwUdQ@mail.gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)

Elijah Newren <newren@xxxxxxxxx> writes:

> Sorry for the delay; modulo two minor issues with the commit message
> it looks good to me.

Thanks.

References:
- [PATCH v4] git-apply: allow simultaneous --cached and --3way options
  - From: Jerry Zhang
- [PATCH v5] git-apply: allow simultaneous --cached and --3way options
  - From: Jerry Zhang
- Re: [PATCH v5] git-apply: allow simultaneous --cached and --3way options
  - From: Junio C Hamano
- Re: [PATCH v5] git-apply: allow simultaneous --cached and --3way options
  - From: Elijah Newren