From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2021 22:35:09 +0000 (-0800)
Subject: Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'
X-Git-Tag: v2.35.0-rc0~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e715503f1c57c43808ac63881e69cb51b08c145;p=thirdparty%2Fgit.git

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"
---

8e715503f1c57c43808ac63881e69cb51b08c145