summaryrefslogtreecommitdiff
path: root/t/t5571-pre-push-hook.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-11-19 10:22:29 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-19 14:13:30 -0800
commite01ae2a4a7e99357b9464b54e48cbf4b4caac036 (patch)
tree13a6f0c79719ffef524d6d20cab4df3304ae4a0f /t/t5571-pre-push-hook.sh
parentGit 2.29.2 (diff)
downloadtgif-e01ae2a4a7e99357b9464b54e48cbf4b4caac036.tar.xz
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>
Diffstat (limited to 't/t5571-pre-push-hook.sh')
0 files changed, 0 insertions, 0 deletions