summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2021-11-18 15:43:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-11-19 17:14:15 (GMT)
commit71076d0edde43a7672a9a0f555753ff078602a64 (patch)
tree9a8ba647ad68488c1f3725b3c8d432b5f6a1b02c /builtin/pull.c
parent5fbd2fc5997dfa4d4593a862fe729b1e7a89bcf8 (diff)
downloadgit-71076d0edde43a7672a9a0f555753ff078602a64.zip
git-71076d0edde43a7672a9a0f555753ff078602a64.tar.gz
git-71076d0edde43a7672a9a0f555753ff078602a64.tar.bz2
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 <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index b311ea6..20b585a 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"