Re: [PATCH v5 0/2] difftool.c: learn a new way start at specified file
- From
ZheNing Hu <adlternative@gmail.com>
- Date
- Feb 17, 2021, 11:40 UTC
- Message-ID
- <CAOLTT8Ri+XbSg_=KaLOCmNX4Nrii1ssN9_FFbnmm7ew4vYN5nA@mail.gmail.com>
- In-Reply-To
- <YCz6oDZCAODPS8sY@generichostname>
Hi Denton Liu, You mean I should cherry-pick Junio's patch to my topic branch, right?
Denton Liu <liu.denton@gmail.com> 于2021年2月17日周三 下午7:14写道：
Show 29 quoted lines
>
> Hi ZheNing,
>
> On Wed, Feb 17, 2021 at 12:12:10PM +0800, ZheNing Hu wrote:
> > Oh, I am sorry.
> > Then I only need to squash the two commit, right?
>
> I've never used GGG before but I suspect that in your GitHub PR, you
> need to set the PR base to 'master' instead of 'jc/diffcore-rotate'.
>
> CCing the creator of GGG, please correct me if I'm wrong.
>
> -Denton
>
> > Junio C Hamano <gitster@pobox.com> 于2021年2月17日周三 上午2:45写道：
> > >
> > > "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
> > >
> > > > Junio C Hamano (1):
> > > > diff: --{rotate,skip}-to=<path>
> > >
> > > That's not part of your series (didn't I ask you not to include it)?
> > >
> > > > ZheNing Hu (1):
> > > > difftool.c: learn a new way start at specified file
> > >
> > > Will see what I find, but I may not be able to get to it today.
> > >
> > > Thanks.