[PATCH 0/2] pull: documentation improvements

These are the non-controversial changes from last-year series [1] which objectively improve our documentation and don't have any reason not to be merged.

Not everyone knows what a rebase or a fast-forward is.

[1] https://lore.kernel.org/git/20201218211026.1937168-1-felipe.contreras@gmail.com/

Felipe Contreras (2):
  doc: pull: explain what is a fast-forward
  pull: improve default warning

 Documentation/git-pull.txt | 41 ++++++++++++++++++++++++++++++++------
 builtin/pull.c             | 22 ++++++++++----------
 2 files changed, 47 insertions(+), 16 deletions(-)