{"thread":{"id":"48062","subject":"[PATCH 0/1] Fix typo in merge-strategies documentation","startedAt":"2018-03-17T03:31:52Z","lastAt":"2018-03-22T16:35:10Z","messageCount":7,"participants":["David Pursehouse","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"341969","messageId":"20180317033142.20119-1-david.pursehouse@gmail.com","threadId":"48062","inReplyTo":null,"subject":"[PATCH 0/1] Fix typo in merge-strategies documentation","fromName":"David Pursehouse","fromEmail":"david.pursehouse@gmail.com","sentAt":"2018-03-17T03:31:41Z","receivedAt":"2018-03-17T03:31:52Z","isPatch":true,"sender":{"key":"david.pursehouse@gmail.com","avatar":"https://gravatar.com/avatar/d3d8397cb0a15f5d6d7e59d7dfe29e28ba4c29cc5deccc401ea210c981bf237a?d=mp&s=160"},"body":"From: David Pursehouse \n\nFixes a minor typo in the merge-strategies documentation.\n\nDavid Pursehouse (1):\n Fix typo in merge-strategies documentation\n\n Documentation/merge-strategies.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n-- \n2.16.2\n\n"},{"id":"341970","messageId":"20180317033142.20119-2-david.pursehouse@gmail.com","threadId":"48062","inReplyTo":"20180317033142.20119-1-david.pursehouse@gmail.com","subject":"[PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"David Pursehouse","fromEmail":"david.pursehouse@gmail.com","sentAt":"2018-03-17T03:31:42Z","receivedAt":"2018-03-17T03:31:58Z","isPatch":true,"sender":{"key":"david.pursehouse@gmail.com","avatar":"https://gravatar.com/avatar/d3d8397cb0a15f5d6d7e59d7dfe29e28ba4c29cc5deccc401ea210c981bf237a?d=mp&s=160"},"body":"From: David Pursehouse \n\nSigned-off-by: David Pursehouse \n---\n Documentation/merge-strategies.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex fd5d748d1..4a58aad4b 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.\n \n theirs;;\n \tThis is the opposite of 'ours'; note that, unlike 'ours', there is\n-\tno 'theirs' merge stragegy to confuse this merge option with.\n+\tno 'theirs' merge strategy to confuse this merge option with.\n \n patience;;\n \tWith this option, 'merge-recursive' spends a little extra time\n-- \n2.16.2\n\n"},{"id":"342192","messageId":"nycvar.QRO.7.76.6.1803191548080.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","threadId":"48062","inReplyTo":"20180317033142.20119-2-david.pursehouse@gmail.com","subject":"Re: [PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-03-19T14:49:06Z","receivedAt":"2018-03-19T14:49:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi David,\n\nOn Sat, 17 Mar 2018, David Pursehouse wrote:\n\n> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\n> index fd5d748d1..4a58aad4b 100644\n> --- a/Documentation/merge-strategies.txt\n> +++ b/Documentation/merge-strategies.txt\n> @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.\n> \n> theirs;;\n> \tThis is the opposite of 'ours'; note that, unlike 'ours', there is\n> -\tno 'theirs' merge stragegy to confuse this merge option with.\n> +\tno 'theirs' merge strategy to confuse this merge option with.\n\nWell spotted: it is `strategy`, not `stragegy` (nor `stragedy`, I might\nwant to add :-))\n\nI just verified that there is no other hit in `git grep stragegy`'s\noutput.\n\nThanks,\nJohannes\n"},{"id":"342201","messageId":"xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com","threadId":"48062","inReplyTo":"20180317033142.20119-2-david.pursehouse@gmail.com","subject":"Re: [PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-03-19T16:51:14Z","receivedAt":"2018-03-19T16:51:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Pursehouse writes:\n\n> From: David Pursehouse \n>\n> Signed-off-by: David Pursehouse \n> ---\n\nI somehow had to stare at the patch for a few minutes, view it in\ntwo Emacs buffers and run M-x compare-windows before I finally spot\nthe single-byte typofix.\n\nWill queue with a retitle.\n\n Documentation/merge-strategies: typofix\n \n It's strategy, not stragegy.\n \n Signed-off-by: David Pursehouse \n Signed-off-by: Junio C Hamano \n\nThanks.\n\n\n> Documentation/merge-strategies.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\n> index fd5d748d1..4a58aad4b 100644\n> --- a/Documentation/merge-strategies.txt\n> +++ b/Documentation/merge-strategies.txt\n> @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.\n> \n> theirs;;\n> \tThis is the opposite of 'ours'; note that, unlike 'ours', there is\n> -\tno 'theirs' merge stragegy to confuse this merge option with.\n> +\tno 'theirs' merge strategy to confuse this merge option with.\n> \n> patience;;\n> \tWith this option, 'merge-recursive' spends a little extra time\n"},{"id":"342477","messageId":"nycvar.QRO.7.76.6.1803212330510.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","threadId":"48062","inReplyTo":"xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-03-21T22:31:14Z","receivedAt":"2018-03-21T22:31:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 19 Mar 2018, Junio C Hamano wrote:\n\n> David Pursehouse writes:\n> \n> > From: David Pursehouse \n> >\n> > Signed-off-by: David Pursehouse \n> > ---\n> \n> I somehow had to stare at the patch for a few minutes, view it in\n> two Emacs buffers and run M-x compare-windows before I finally spot\n> the single-byte typofix.\n\nPro-tip: git am && git show --color-words\n\n:-)\n\nCiao,\nDscho\n"},{"id":"342486","messageId":"CAM5Va3kECqGmw-oMQ_PJuVqfC8-OWWnfkPJQW1Q+bL7TgOEVfQ@mail.gmail.com","threadId":"48062","inReplyTo":"xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"David Pursehouse","fromEmail":"david.pursehouse@gmail.com","sentAt":"2018-03-21T23:50:02Z","receivedAt":"2018-03-21T23:50:19Z","isPatch":true,"sender":{"key":"david.pursehouse@gmail.com","avatar":"https://gravatar.com/avatar/d3d8397cb0a15f5d6d7e59d7dfe29e28ba4c29cc5deccc401ea210c981bf237a?d=mp&s=160"},"body":"On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano wrote:\n>\n> I somehow had to stare at the patch for a few minutes, view it in\n> two Emacs buffers and run M-x compare-windows before I finally spot\n> the single-byte typofix.\n>\n> Will queue with a retitle.\n\n[resending as plain text]\n\nThanks, and sorry for the confusion. I'll provide a more detailed\ncommit message next time.\n"},{"id":"342505","messageId":"xmqqk1u4m5l8.fsf@gitster-ct.c.googlers.com","threadId":"48062","inReplyTo":"nycvar.QRO.7.76.6.1803212330510.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","subject":"Re: [PATCH 1/1] Fix typo in merge-strategies documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-03-22T16:34:59Z","receivedAt":"2018-03-22T16:35:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Mon, 19 Mar 2018, Junio C Hamano wrote:\n>\n>> David Pursehouse writes:\n>> \n>> > From: David Pursehouse \n>> >\n>> > Signed-off-by: David Pursehouse \n>> > ---\n>> \n>> I somehow had to stare at the patch for a few minutes, view it in\n>> two Emacs buffers and run M-x compare-windows before I finally spot\n>> the single-byte typofix.\n>\n> Pro-tip: git am && git show --color-words\n\nYeah, I know, but that would not work while I am wondering if the\npatch is worth applying in the first place ;-)\n"}]}