> True, but isn't that a slipperly slope to cram more and more of the > material from the manual into the "hint" that is supposed to be > short, helpful and not so obnoxious? Perhaps removing "pull again > before you push", and saying "updates were rejected because X; see > the note about fast-forwards in the manual" and nothing else would > be an improvement? I agree. Removing "pull again before you push" is definitely an improvement for our workflow. But I know some teams don't use rebase at all, so it may not be ideal for them.