undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull: don't say that merge is "the default strategy"

Browse Source 
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>
This commit is contained in:
Alex Henrie 2021-11-18 08:43:17 -07:00 committed by Junio C Hamano
parent 5fbd2fc599
commit 71076d0edd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pull.c
View File

@ -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" "You can do so by running one of the following commands sometime before\n"
"your next pull:\n" "your next pull:\n"
"\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.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n" " git config pull.ff only # fast-forward only\n"
"\n" "\n"