diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-14 09:08:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-15 17:39:42 -0800 |
| commit | 7539fdc6290750c617c0b638c2f3b2f63c389ed3 (patch) | |
| tree | d4d15e359c4dca64efdb6aa7b0ac8bf842736e8e /t/t2107-update-index-basic.sh | |
| parent | pull: get rid of unnecessary global variable (diff) | |
| download | tgif-7539fdc6290750c617c0b638c2f3b2f63c389ed3.tar.xz | |
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>
Diffstat (limited to 't/t2107-update-index-basic.sh')
0 files changed, 0 insertions, 0 deletions