Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 12, 2018, 09:00 UTC
Message-ID: <nycvar.QRO.7.76.6.1804121059110.65@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <CAPig+cRfQgz2tCab2d9g-XznHORW0FJvDKS4fe85JkLPxm2HMQ@mail.gmail.com>

Hi Eric & Phillip,

On Wed, 11 Apr 2018, Eric Sunshine wrote:

Show 15 quoted lines

> On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood
> <phillip.wood@talktalk.net> wrote:
> > On 10/04/18 13:30, Johannes Schindelin wrote:
> >> +The `reset` command is essentially a `git reset --hard` to the specified
> >> +revision (typically a previously-labeled one).
> >
> > s/labeled/labelled/
> 
> American vs. British English spelling.
> 
> CodingGuidelines and SubmittingPatches talk about this. Junio
> summarizes the issue well in [1]. The TL;DR is to lean toward the
> American English spelling.
> 
> [1]: https://public-inbox.org/git/xmqq4m9gpebm.fsf@gitster.mtv.corp.google.com/

Thanks, I meant to look that up because I was not sure, and now I do not have to ;-)

No worries, Phillip, I will keep spelling your name with two `l`s. :0)

Ciao, Dscho