{"thread":{"id":"56935","subject":"[PATCH] pull: don't say that merge is \"the default strategy\"","startedAt":"2021-11-18T15:43:24Z","lastAt":"2021-11-19T17:16:52Z","messageCount":5,"participants":["Alex Henrie","Junio C Hamano","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"441613","messageId":"20211118154317.639118-1-alexhenrie24@gmail.com","threadId":"56935","inReplyTo":null,"subject":"[PATCH] pull: don't say that merge is \"the default strategy\"","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2021-11-18T15:43:17Z","receivedAt":"2021-11-18T15:43:24Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Git no longer has a default strategy for reconciling divergent branches,\nbecause there's no way for Git to know which strategy is appropriate in\nany particular situation.\n\nThe initially proposed version of commit\n031e2f7ae195069d00d21cde906fce5b0318dbdd, \"pull: abort by default when\nfast-forwarding is not possible\", dropped this phrase from the message.\nIt appears that leaving it in the message in the final version of the\npatch was accidental.\n\nSigned-off-by: Alex Henrie \n---\n builtin/pull.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 127798ba84..590f15bf9b 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)\n \t\t \"You can do so by running one of the following commands sometime before\\n\"\n \t\t \"your next pull:\\n\"\n \t\t \"\\n\"\n-\t\t \" git config pull.rebase false # merge (the default strategy)\\n\"\n+\t\t \" git config pull.rebase false # merge\\n\"\n \t\t \" git config pull.rebase true # rebase\\n\"\n \t\t \" git config pull.ff only # fast-forward only\\n\"\n \t\t \"\\n\"\n-- \n2.34.0\n\n"},{"id":"441660","messageId":"xmqqk0h5w3qy.fsf@gitster.g","threadId":"56935","inReplyTo":"20211118154317.639118-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] pull: don't say that merge is \"the default strategy\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-18T21:30:45Z","receivedAt":"2021-11-18T21:30:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Henrie writes:\n\n> Git no longer has a default strategy for reconciling divergent branches,\n> because there's no way for Git to know which strategy is appropriate in\n> any particular situation.\n\nA very good observation, and the patch makes sense.\n\n> The initially proposed version of commit\n> 031e2f7ae195069d00d21cde906fce5b0318dbdd, \"pull: abort by default when\n> fast-forwarding is not possible\", dropped this phrase from the message.\n> It appears that leaving it in the message in the final version of the\n> patch was accidental.\n\nHmph, the one before later iterations v$N, i.e.\n \nhttps://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/ \n\nseems to keep \"the default\" label from the beginning.\n\nI am tempted to drop this latter last paragraph, which looks more\nlike a guess than anything else, and does not add much value to\nfuture readers of the \"git log\".\n\n>\n> Signed-off-by: Alex Henrie \n> ---\n> builtin/pull.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/pull.c b/builtin/pull.c\n> index 127798ba84..590f15bf9b 100644\n> --- a/builtin/pull.c\n> +++ b/builtin/pull.c\n> @@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)\n> \t\t \"You can do so by running one of the following commands sometime before\\n\"\n> \t\t \"your next pull:\\n\"\n> \t\t \"\\n\"\n> -\t\t \" git config pull.rebase false # merge (the default strategy)\\n\"\n> +\t\t \" git config pull.rebase false # merge\\n\"\n> \t\t \" git config pull.rebase true # rebase\\n\"\n> \t\t \" git config pull.ff only # fast-forward only\\n\"\n> \t\t \"\\n\"\n"},{"id":"441661","messageId":"CAMMLpeSuL2k2semwS+K1jxTNZEV79GzCymFZo+1VcsyU6bYTrg@mail.gmail.com","threadId":"56935","inReplyTo":"xmqqk0h5w3qy.fsf@gitster.g","subject":"Re: [PATCH] pull: don't say that merge is \"the default strategy\"","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2021-11-18T21:40:20Z","receivedAt":"2021-11-18T21:40:35Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"On Thu, Nov 18, 2021 at 2:30 PM Junio C Hamano wrote:\n>\n> Alex Henrie writes:\n>\n> > Git no longer has a default strategy for reconciling divergent branches,\n> > because there's no way for Git to know which strategy is appropriate in\n> > any particular situation.\n>\n> A very good observation, and the patch makes sense.\n\nThanks, I'm glad you agree.\n\n> > The initially proposed version of commit\n> > 031e2f7ae195069d00d21cde906fce5b0318dbdd, \"pull: abort by default when\n> > fast-forwarding is not possible\", dropped this phrase from the message.\n> > It appears that leaving it in the message in the final version of the\n> > patch was accidental.\n>\n> Hmph, the one before later iterations v$N, i.e.\n>\n> https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/\n>\n> seems to keep \"the default\" label from the beginning.\n\nI was referring to the patch that I originally wrote, before Elijah\nmade the changes that actually got the patch accepted:\nhttps://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/\n\n> I am tempted to drop this latter last paragraph, which looks more\n> like a guess than anything else, and does not add much value to\n> future readers of the \"git log\".\n\nThat's fine by me. I almost didn't include the second paragraph in the\ncommit message to begin with.\n\n-Alex\n"},{"id":"441692","messageId":"CABPp-BHAqhpK4F2wTRhxZ5DXKOJExMxihbdpx1d2fYqAgtzS9w@mail.gmail.com","threadId":"56935","inReplyTo":"CAMMLpeSuL2k2semwS+K1jxTNZEV79GzCymFZo+1VcsyU6bYTrg@mail.gmail.com","subject":"Re: [PATCH] pull: don't say that merge is \"the default strategy\"","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2021-11-19T05:41:22Z","receivedAt":"2021-11-19T05:41:37Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Thu, Nov 18, 2021 at 1:40 PM Alex Henrie wrote:\n>\n> On Thu, Nov 18, 2021 at 2:30 PM Junio C Hamano wrote:\n> >\n> > Alex Henrie writes:\n> >\n> > > Git no longer has a default strategy for reconciling divergent branches,\n> > > because there's no way for Git to know which strategy is appropriate in\n> > > any particular situation.\n> >\n> > A very good observation, and the patch makes sense.\n>\n> Thanks, I'm glad you agree.\n>\n> > > The initially proposed version of commit\n> > > 031e2f7ae195069d00d21cde906fce5b0318dbdd, \"pull: abort by default when\n> > > fast-forwarding is not possible\", dropped this phrase from the message.\n> > > It appears that leaving it in the message in the final version of the\n> > > patch was accidental.\n> >\n> > Hmph, the one before later iterations v$N, i.e.\n> >\n> > https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/\n> >\n> > seems to keep \"the default\" label from the beginning.\n>\n> I was referring to the patch that I originally wrote, before Elijah\n> made the changes that actually got the patch accepted:\n> https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/\n>\n> > I am tempted to drop this latter last paragraph, which looks more\n> > like a guess than anything else, and does not add much value to\n> > future readers of the \"git log\".\n>\n> That's fine by me. I almost didn't include the second paragraph in the\n> commit message to begin with.\n>\n> -Alex\n\nSorry for missing that bit from your original patch; thanks for\ncatching it and sending in the update.\n"},{"id":"441767","messageId":"xmqq7dd4qd4v.fsf@gitster.g","threadId":"56935","inReplyTo":"CABPp-BHAqhpK4F2wTRhxZ5DXKOJExMxihbdpx1d2fYqAgtzS9w@mail.gmail.com","subject":"Re: [PATCH] pull: don't say that merge is \"the default strategy\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-19T17:16:48Z","receivedAt":"2021-11-19T17:16:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Elijah Newren writes:\n\n>> I was referring to the patch that I originally wrote, before Elijah\n>> made the changes that actually got the patch accepted:\n>> https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/\n\nAh, with that URL, the extra paragraph would have made sense. Here\nis how amended the log message with this new information.\n\nThanks, all.\n\n----- >8 --------- >8 --------- >8 --------- >8 -----\nFrom: Alex Henrie \nDate: Thu, 18 Nov 2021 08:43:17 -0700\nSubject: [PATCH] pull: don't say that merge is \"the default strategy\"\n\nGit no longer has a default strategy for reconciling divergent branches,\nbecause there's no way for Git to know which strategy is appropriate in\nany particular situation.\n\nThe initially proposed version in [*], that eventually became\n031e2f7a (pull: abort by default when fast-forwarding is not\npossible, 2021-07-22), dropped this phrase from the message, but\nit was left in the final version by accident.\n\n* https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/\n\nSigned-off-by: Alex Henrie \nSigned-off-by: Junio C Hamano \n---\n builtin/pull.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex b311ea6b9d..20b585a76b 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -939,7 +939,7 @@ static void show_advice_pull_non_ff(void)\n \t\t \"You can do so by running one of the following commands sometime before\\n\"\n \t\t \"your next pull:\\n\"\n \t\t \"\\n\"\n-\t\t \" git config pull.rebase false # merge (the default strategy)\\n\"\n+\t\t \" git config pull.rebase false # merge\\n\"\n \t\t \" git config pull.rebase true # rebase\\n\"\n \t\t \" git config pull.ff only # fast-forward only\\n\"\n \t\t \"\\n\"\n-- \n2.34.0-202-gd9146917d7\n\n"}]}