# [PATCH 0/1] Fix typo in merge-strategies documentation 7 messages from 2018-03-17 to 2018-03-22. Participants: David Pursehouse, Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/48062 ## David Pursehouse, 2018-03-17 03:31 Subject: [PATCH 0/1] Fix typo in merge-strategies documentation Message-ID: <20180317033142.20119-1-david.pursehouse@gmail.com> URL: https://gitlist.dev/e/20180317033142.20119-1-david.pursehouse%40gmail.com ``` From: David Pursehouse Fixes a minor typo in the merge-strategies documentation. David Pursehouse (1): Fix typo in merge-strategies documentation Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.2 ``` ## David Pursehouse, 2018-03-17 03:31 Subject: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: <20180317033142.20119-2-david.pursehouse@gmail.com> URL: https://gitlist.dev/e/20180317033142.20119-2-david.pursehouse%40gmail.com In-Reply-To: <20180317033142.20119-1-david.pursehouse@gmail.com> ``` From: David Pursehouse Signed-off-by: David Pursehouse --- 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 fd5d748d1..4a58aad4b 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. theirs;; This is the opposite of 'ours'; note that, unlike 'ours', there is - no 'theirs' merge stragegy to confuse this merge option with. + no 'theirs' merge strategy to confuse this merge option with. patience;; With this option, 'merge-recursive' spends a little extra time -- 2.16.2 ``` ## Johannes Schindelin, 2018-03-19 14:49 Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1803191548080.55%40ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com> ``` Hi David, On Sat, 17 Mar 2018, David Pursehouse wrote: > diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt > index fd5d748d1..4a58aad4b 100644 > --- a/Documentation/merge-strategies.txt > +++ b/Documentation/merge-strategies.txt > @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. > > theirs;; > This is the opposite of 'ours'; note that, unlike 'ours', there is > - no 'theirs' merge stragegy to confuse this merge option with. > + no 'theirs' merge strategy to confuse this merge option with. Well spotted: it is `strategy`, not `stragegy` (nor `stragedy`, I might want to add :-)) I just verified that there is no other hit in `git grep stragegy`'s output. Thanks, Johannes ``` ## Junio C Hamano, 2018-03-19 16:51 Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: URL: https://gitlist.dev/e/xmqqo9jkvwjh.fsf%40gitster-ct.c.googlers.com In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com> ``` David Pursehouse writes: > From: David Pursehouse > > Signed-off-by: David Pursehouse > --- I somehow had to stare at the patch for a few minutes, view it in two Emacs buffers and run M-x compare-windows before I finally spot the single-byte typofix. Will queue with a retitle. Documentation/merge-strategies: typofix It's strategy, not stragegy. Signed-off-by: David Pursehouse Signed-off-by: Junio C Hamano Thanks. > 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 fd5d748d1..4a58aad4b 100644 > --- a/Documentation/merge-strategies.txt > +++ b/Documentation/merge-strategies.txt > @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. > > theirs;; > This is the opposite of 'ours'; note that, unlike 'ours', there is > - no 'theirs' merge stragegy to confuse this merge option with. > + no 'theirs' merge strategy to confuse this merge option with. > > patience;; > With this option, 'merge-recursive' spends a little extra time ``` ## Johannes Schindelin, 2018-03-21 22:31 Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1803212330510.77%40ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz In-Reply-To: ``` Hi Junio, On Mon, 19 Mar 2018, Junio C Hamano wrote: > David Pursehouse writes: > > > From: David Pursehouse > > > > Signed-off-by: David Pursehouse > > --- > > I somehow had to stare at the patch for a few minutes, view it in > two Emacs buffers and run M-x compare-windows before I finally spot > the single-byte typofix. Pro-tip: git am && git show --color-words :-) Ciao, Dscho ``` ## David Pursehouse, 2018-03-21 23:50 Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: URL: https://gitlist.dev/e/CAM5Va3kECqGmw-oMQ_PJuVqfC8-OWWnfkPJQW1Q%2BbL7TgOEVfQ%40mail.gmail.com In-Reply-To: ``` On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano wrote: > > I somehow had to stare at the patch for a few minutes, view it in > two Emacs buffers and run M-x compare-windows before I finally spot > the single-byte typofix. > > Will queue with a retitle. [resending as plain text] Thanks, and sorry for the confusion. I'll provide a more detailed commit message next time. ``` ## Junio C Hamano, 2018-03-22 16:34 Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation Message-ID: URL: https://gitlist.dev/e/xmqqk1u4m5l8.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Johannes Schindelin writes: > On Mon, 19 Mar 2018, Junio C Hamano wrote: > >> David Pursehouse writes: >> >> > From: David Pursehouse >> > >> > Signed-off-by: David Pursehouse >> > --- >> >> I somehow had to stare at the patch for a few minutes, view it in >> two Emacs buffers and run M-x compare-windows before I finally spot >> the single-byte typofix. > > Pro-tip: git am && git show --color-words Yeah, I know, but that would not work while I am wondering if the patch is worth applying in the first place ;-) ```