From: ZheNing Hu <adlternative@gmail.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
ZheNing Hu via GitGitGadget <gitgitgadget@gmail.com>,
Git List <git@vger.kernel.org>, David Aguilar <davvid@gmail.com>,
John Keeping <john@keeping.me.uk>,
Ryan Zoeller <rtzoeller@rtzoeller.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v5 0/2] difftool.c: learn a new way start at specified file
Date: Wed, 17 Feb 2021 19:40:23 +0800 [thread overview]
Message-ID: <CAOLTT8Ri+XbSg_=KaLOCmNX4Nrii1ssN9_FFbnmm7ew4vYN5nA@mail.gmail.com> (raw)
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写道:
>
> 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.
next prev parent reply other threads:[~2021-02-17 11:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 15:19 [PATCH] git-difftool-helper.sh: learn a new way skip to save point 阿德烈 via GitGitGadget
2021-02-07 18:29 ` Junio C Hamano
2021-02-07 19:04 ` Junio C Hamano
2021-02-08 8:06 ` 胡哲宁
2021-02-08 17:02 ` [PATCH v2] git-difftool-helper.sh: learn a new way go back to last " ZheNing Hu via GitGitGadget
2021-02-08 20:13 ` Junio C Hamano
2021-02-08 22:15 ` David Aguilar
2021-02-08 23:34 ` Junio C Hamano
2021-02-09 6:19 ` 胡哲宁
2021-02-09 6:04 ` 胡哲宁
2021-02-09 15:30 ` [PATCH v3] difftool.c: learn a new way start from specified file ZheNing Hu via GitGitGadget
2021-02-09 18:17 ` Junio C Hamano
2021-02-10 17:00 ` 胡哲宁
2021-02-10 18:16 ` Junio C Hamano
2021-02-10 20:05 ` Junio C Hamano
2021-02-14 7:53 ` ZheNing Hu
2021-02-14 13:09 ` [PATCH v4] difftool.c: learn a new way start at " ZheNing Hu via GitGitGadget
2021-02-16 1:46 ` Junio C Hamano
2021-02-16 12:56 ` [PATCH v5 0/2] " ZheNing Hu via GitGitGadget
2021-02-16 12:56 ` [PATCH v5 1/2] diff: --{rotate,skip}-to=<path> Junio C Hamano via GitGitGadget
2021-02-16 12:56 ` [PATCH v5 2/2] difftool.c: learn a new way start at specified file ZheNing Hu via GitGitGadget
2021-02-17 10:31 ` Junio C Hamano
2021-02-17 16:18 ` ZheNing Hu
2021-02-16 18:45 ` [PATCH v5 0/2] " Junio C Hamano
2021-02-17 4:12 ` ZheNing Hu
2021-02-17 11:14 ` Denton Liu
2021-02-17 11:40 ` ZheNing Hu [this message]
2021-02-17 18:56 ` Junio C Hamano
2021-02-18 5:20 ` ZheNing Hu
2021-02-18 15:04 ` ZheNing Hu
2021-02-18 19:11 ` Junio C Hamano
2021-02-19 10:59 ` ZheNing Hu
2021-02-25 11:08 ` Johannes Schindelin
2021-02-25 19:01 ` Junio C Hamano
2021-02-19 12:53 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2021-02-22 15:11 ` ZheNing Hu
2021-02-22 21:40 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOLTT8Ri+XbSg_=KaLOCmNX4Nrii1ssN9_FFbnmm7ew4vYN5nA@mail.gmail.com' \
--to=adlternative@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=liu.denton@gmail.com \
--cc=rtzoeller@rtzoeller.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).