projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b044db9) | patch
pull: correct condition to trigger non-ff advice
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2020 17:08:57 +0000 (09:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Dec 2020 01:39:42 +0000 (17:39 -0800)
commit7539fdc6290750c617c0b638c2f3b2f63c389ed3
treed4d15e359c4dca64efdb6aa7b0ac8bf842736e8etree | snapshot
parentb044db9172f020768e85835f87bfc5564e310714commit | diff
pull: correct condition to trigger non-ff advice

Refactor the advise() call that teaches users how they can choose
between merge and rebase into a helper function.  This revealed that
the caller's logic needs to be further clarified to allow future
actions (like "erroring out" instead of the current "go ahead and
merge anyway") that should happen whether the advice message is
squelched out.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.