git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Dominic Jäger <dominic.jaeger@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-strategies: Fix typo "reflected to"
Date: Mon, 11 Nov 2019 11:03:13 +0900
Message-ID: <xmqq5zjrjhjy.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com> ("Dominic =?utf-8?Q?J=C3=A4ger=22's?= message of "Fri, 8 Nov 2019 15:47:01 +0100")

Dominic Jäger <dominic.jaeger@gmail.com> writes:

> reflected to" does not exist (according to
> https://dictionary.cambridge.org/dictionary/english/reflect?q=reflected and
> https://www.merriam-webster.com/dictionary/reflected)
>
> Signed-off-by: Dominic Jäger <dominic.jaeger@gmail.com>
> ---
> I only took a quick glance at the submitting patch guidelines.
> Feel free to quickly push this yourself if you want.
> Also, I'm not native, so I hope I looked this up correctly.

Thanks, looks good.  Will queue.

>
>  Documentation/merge-strategies.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/merge-strategies.txt
> b/Documentation/merge-strategies.txt
> index aa66cbe41e..2912de706b 100644
> --- a/Documentation/merge-strategies.txt
> +++ b/Documentation/merge-strategies.txt
> @@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:
>  ours;;
>         This option forces conflicting hunks to be auto-resolved cleanly by
>         favoring 'our' version.  Changes from the other tree that do not
> -       conflict with our side are reflected to the merge result.
> +       conflict with our side are reflected in the merge result.
>         For a binary file, the entire contents are taken from our side.
>  +
>  This should not be confused with the 'ours' merge strategy, which does not
> --
> 2.17.1

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-08 14:47 Dominic Jäger
2019-11-11  2:03 ` Junio C Hamano [this message]

Reply instructions:

You may reply publically 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=xmqq5zjrjhjy.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=dominic.jaeger@gmail.com \
    --cc=git@vger.kernel.org \
    /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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git