pull: colorize the hint about setting `pull.rebase`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 19 Nov 2020 10:22:29 +0000 (10:22 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 22:13:30 +0000 (14:13 -0800)
commite01ae2a4a7e99357b9464b54e48cbf4b4caac036
tree13a6f0c79719ffef524d6d20cab4df3304ae4a0f
parent898f80736c75878acc02dc55672317fcc0e0a5a6
pull: colorize the hint about setting `pull.rebase`

In d18c950a69f (pull: warn if the user didn't say whether to rebase or
to merge, 2020-03-09), a new hint was introduced to encourage users to
make a conscious decision about whether they want their pull to merge or
to rebase by configuring the `pull.rebase` setting.

This warning was clearly intended to advise users, but as pointed out in
https://lore.kernel.org/git/87ima2rdsm.fsf%40evledraar.gmail.com, it
uses `warning()` instead of `advise()`.

One consequence is that the advice is not colorized in the same manner
as other, similar messages. So let's use `advise()` instead.

Pointed-out-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c
t/t7601-merge-pull-config.sh