threads / patch / 52220

patchmerge-strategies: Fix typo "reflected to"

Subject: [PATCH] merge-strategies: Fix typo "reflected to"

## tl;dr

2 messages between Nov 8, 2019 and Nov 11, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Dominic Jäger· Nov 8, 2019, 14:47 UTC · lore

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(-)

Show changes to Documentation/merge-strategies.txt +1 −2

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

Junio C Hamano· Nov 11, 2019, 02:03 UTC · re: Dominic Jäger · lore

Re: [PATCH] merge-strategies: Fix typo "reflected to"

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

Show 9 quoted lines

> 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.

Show 20 quoted lines

>
>  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