From: Felipe Contreras Date: Mon, 05 Jul 2021 12:32:04 GMT Subject: [RFC PATCH 30/35] pull: add diverging advice on fast-forward mode Message-ID: <20210705123209.1808663-31-felipe.contreras@gmail.com> In-Reply-To: <20210705123209.1808663-1-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- builtin/pull.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/pull.c b/builtin/pull.c index cbc102ee45..f4f822700a 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -1118,8 +1118,10 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (!mode && opt_verbosity >= 0) show_advice_pull_non_ff(); - if (mode == PULL_MODE_FAST_FORWARD) + if (mode == PULL_MODE_FAST_FORWARD) { + diverging_advice(); die(_("The pull was not fast-forward, either merge or rebase.\n")); + } } if (opt_rebase >= REBASE_TRUE) { -- 2.32.0.36.g70aac2b1aa