On Mon, Dec 7, 2020 at 5:08 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > I thought that the idea that the word can be used as a verb, after > discussing advise() messages that tells the users that they can > "merge, rebase or fast-forward", was given and not something anybody > needs to be explained about. I removed that in the latest version, precisely because you can't tell git pull to resolve a diverging branch situation by doing a "fast-forward". It's only merge or rebase. -- Felipe Contreras
