From: Alex Henrie Date: Thu, 18 Nov 2021 15:43:17 +0000 (-0700) Subject: pull: don't say that merge is "the default strategy" X-Git-Tag: v2.35.0-rc0~109^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71076d0edde43a7672a9a0f555753ff078602a64;p=thirdparty%2Fgit.git 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/20210627000855.530985-1-alexhenrie24@gmail.com/ Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano --- 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"