Not all our users are experts in git who understand their configurations perfectly, some might be stuck in a simple error: Not possible to fast-forward, aborting. That's not very friendly. Let's add a bit more advice in case the user doesn't know what's going on. Felipe Contreras (2): advice: add diverging advice for novices advice: make diverging advice configurable Documentation/config/advice.txt | 2 ++ advice.c | 9 +++++++++ advice.h | 1 + 3 files changed, 12 insertions(+) -- 2.39.2