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 of commit 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when fast-forwarding is not possible", dropped this phrase from the message. It appears that leaving it in the message in the final version of the patch was accidental. Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx> --- builtin/pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/pull.c b/builtin/pull.c index 127798ba84..590f15bf9b 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -970,7 +970,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
