From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: 林自均 <johnlinp@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"John Lin via GitGitGadget" <gitgitgadget@gmail.com>,
Git <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH 1/1] status: remove the empty line after hints
Date: Mon, 3 Jun 2019 16:17:47 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1906031614020.48@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAKO26MtvBRo76TenubyeVNkeA6e5yrS4DZFSLG1ByztP7mMVXw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
Hi John Lin,
On Sat, 1 Jun 2019, 林自均 wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> 於 2019年5月29日 週三
> 下午7:51寫道:
> >
> > You could already rebase it on top of
> > https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in
> > your cover letter, and send a new iteration.
>
> Thanks for the suggestion. I already rebase on your
> nd/switch-and-restore: https://github.com/gitgitgadget/git/pull/196
> However, it seems to have some conflict with the master branch and
> gitgitgadget refused to submit the patch. So I guess I still have to
> wait for the nd/switch-and-restore to resolve the conflict.
I am so sorry for being so sloppy. I should have said explicitly what I
had in mind: target the nd/switch-and-restore branch.
The GitGitGadget fork mirrors not only maint, master, next and pu, but
also the individual branches that Junio merges into pu (which are
published at https://github.com/gitster/git). That is, you can click the
Edit button next to your PR description, and instead of editing the PR
description, choose a different target branch from the drop-down box below
it.
Since it was totally my mistake for not telling you this explicitly, I
allowed myself to do exactly this for you. The Azure Pipeline is running
as we speak.
Thanks & my apologies,
Johannes
next prev parent reply other threads:[~2019-06-03 14:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 10:54 [PATCH 0/1] status: remove the empty line after hints John Lin via GitGitGadget
2019-05-15 10:54 ` [PATCH 1/1] " John Lin via GitGitGadget
2019-05-28 7:42 ` 林自均
2019-05-28 20:40 ` Junio C Hamano
2019-05-28 23:08 ` 林自均
2019-05-29 11:51 ` Johannes Schindelin
2019-06-01 1:12 ` 林自均
2019-06-03 14:17 ` Johannes Schindelin [this message]
2019-06-03 15:06 ` 林自均
2019-06-04 13:37 ` Johannes Schindelin
2019-06-04 14:02 ` [PATCH v2 0/1] " John Lin via GitGitGadget
2019-06-04 14:02 ` [PATCH v2 1/1] " John Lin via GitGitGadget
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=nycvar.QRO.7.76.6.1906031614020.48@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johnlinp@gmail.com \
--cc=pclouds@gmail.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).