Hi Denton Liu, You mean I should cherry-pick Junio's patch to my topic branch, right? Denton Liu <liu.denton@xxxxxxxxx> 于2021年2月17日周三 下午7:14写道: > > 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@xxxxxxxxx> 于2021年2月17日周三 上午2:45写道: > > > > > > "ZheNing Hu via GitGitGadget" <gitgitgadget@xxxxxxxxx> 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.