git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] merge-strategies: Fix typo "reflected to"
@ 2019-11-08 14:47 Dominic Jäger
  2019-11-11  2:03 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Dominic Jäger @ 2019-11-08 14:47 UTC (permalink / raw)
  To: git

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.

 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] merge-strategies: Fix typo "reflected to"
  2019-11-08 14:47 [PATCH] merge-strategies: Fix typo "reflected to" Dominic Jäger
@ 2019-11-11  2:03 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2019-11-11  2:03 UTC (permalink / raw)
  To: Dominic Jäger; +Cc: git

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-11  2:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-08 14:47 [PATCH] merge-strategies: Fix typo "reflected to" Dominic Jäger
2019-11-11  2:03 ` Junio C Hamano

Code repositories for project(s) associated with this 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).