Subject: Re: [PATCH] pull: don't say that merge is "the default strategy"

From: Junio C Hamano <[email-masked]>
Date: Fri, 19 Nov 2021 09:16:48 -0800

Elijah Newren <[email-masked]> writes:

>> I was referring to the patch that I originally wrote, before Elijah
>> made the changes that actually got the patch accepted:
>> https://lore.kernel.org/git/[email-masked]/

Ah, with that URL, the extra paragraph would have made sense.  Here
is how amended the log message with this new information.

Thanks, all.

----- >8 --------- >8 --------- >8 --------- >8 -----
From: Alex Henrie <[email-masked]>
Date: Thu, 18 Nov 2021 08:43:17 -0700
Subject: [PATCH] pull: don't say that merge is "the default strategy"

Git no longer has a default strategy for reconciling divergent branches,
because there's no way for Git to know which strategy is appropriate in
any particular situation.

The initially proposed version in [*], that eventually became
031e2f7a (pull: abort by default when fast-forwarding is not
possible, 2021-07-22), dropped this phrase from the message, but
it was left in the final version by accident.

* https://lore.kernel.org/git/[email-masked]/

Signed-off-by: Alex Henrie <[email-masked]>
Signed-off-by: Junio C Hamano <[email-masked]>
---
 builtin/pull.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index b311ea6b9d..20b585a76b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -939,7 +939,7 @@ static void show_advice_pull_non_ff(void)
 		 "You can do so by running one of the following commands sometime before\n"
 		 "your next pull:\n"
 		 "\n"
-		 "  git config pull.rebase false  # merge (the default strategy)\n"
+		 "  git config pull.rebase false  # merge\n"
 		 "  git config pull.rebase true   # rebase\n"
 		 "  git config pull.ff only       # fast-forward only\n"
 		 "\n"
-- 
2.34.0-202-gd9146917d7