All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "René Nyffenegger" <mail@renenyffenegger.ch>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fix typo 'In such these cases'
Date: Mon, 02 May 2016 11:46:29 -0700	[thread overview]
Message-ID: <xmqqa8k8ti0q.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <572703EC.20405@renenyffenegger.ch> ("René Nyffenegger"'s message of "Mon, 2 May 2016 09:38:20 +0200")

René Nyffenegger <mail@renenyffenegger.ch> writes:

> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= <rene.nyffenegger@adp-gmbh.ch>
> Date: Mon, 2 May 2016 09:19:46 +0200
> Subject: [PATCH] Documentation: Fix typo 'In such these cases'

For the next time, remember that these four lines are usually not
meant to go to the body of the e-mail.

> Fix "In such these cases, ..." to "In such cases, ..."
> in Documentation/glossary-content.txt

Wow.  It is an ancient typo in 9290cd58 (Added definitions for a few
words:, 2006-05-03) that survives to the day.

Thanks.  Will queue.

> Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch>
> ---
>  Documentation/glossary-content.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index cafc284..9ceca05 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no
>  	A fast-forward is a special type of <<def_merge,merge>> where you have a
>  	<<def_revision,revision>> and you are "merging" another
>  	<<def_branch,branch>>'s changes that happen to be a descendant of what
> -	you have. In such these cases, you do not make a new <<def_merge,merge>>
> +	you have. In these cases, you do not make a new <<def_merge,merge>>
>  	<<def_commit,commit>> but instead just update to his
>  	revision. This will happen frequently on a
>  	<<def_remote_tracking_branch,remote-tracking branch>> of a remote

  reply	other threads:[~2016-05-02 18:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-02  7:38 [PATCH] fix typo 'In such these cases' René Nyffenegger
2016-05-02 18:46 ` Junio C Hamano [this message]
2016-05-02 19:29   ` René Nyffenegger
2016-05-02 19:36     ` Junio C Hamano
2016-05-02 19:41       ` René Nyffenegger

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqa8k8ti0q.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mail@renenyffenegger.ch \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.