mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'
The advice message given by "git pull" when the user hasn't made a choice between merge and rebase still said that the merge is the default, which no longer is the case. This has been corrected. * ah/advice-pull-has-no-preference-between-rebase-and-merge: pull: don't say that merge is "the default strategy"
This commit is contained in:
commit
8e715503f1
|
@ -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"
|
"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"
|
||||||
|
|
Loading…
Reference in a new issue