From: "Dominic Jäger" <email@example.com> To: firstname.lastname@example.org Subject: [PATCH] merge-strategies: Fix typo "reflected to" Date: Fri, 8 Nov 2019 15:47:01 +0100 [thread overview] Message-ID: <CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com> (raw) 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 <email@example.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
next reply other threads:[~2019-11-08 14:47 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 14:47 Dominic Jäger [this message] 2019-11-11 2:03 ` Junio C Hamano
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 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='CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com' \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH] merge-strategies: Fix typo "reflected to"' \ /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
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).