diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:09 -0800 |
| commit | 8e715503f1c57c43808ac63881e69cb51b08c145 (patch) | |
| tree | 3ff12eb3b01a11a5b08f916df96b84bf6325eefc /t/t3417-rebase-whitespace-fix.sh | |
| parent | Merge branch 'ab/checkout-branch-info-leakfix' (diff) | |
| parent | pull: don't say that merge is "the default strategy" (diff) | |
| download | tgif-8e715503f1c57c43808ac63881e69cb51b08c145.tar.xz | |
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"
Diffstat (limited to 't/t3417-rebase-whitespace-fix.sh')
0 files changed, 0 insertions, 0 deletions