Re: [PATCH 1/1] status: remove the empty line after hints

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 3, 2019, 14:17 UTC
Message-ID: <nycvar.QRO.7.76.6.1906031614020.48@tvgsbejvaqbjf.bet>
In-Reply-To: <CAKO26MtvBRo76TenubyeVNkeA6e5yrS4DZFSLG1ByztP7mMVXw@mail.gmail.com>

Hi John Lin,

On Sat, 1 Jun 2019, 林自均 wrote:

Show 12 quoted lines

> 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