[RFC/PATCH,0/3] pull: warning improvements part 2

Message

Felipe Contreras Dec. 15, 2020, 8:46 a.m. UTC

This patch series goes on top of fc/pull-merge-rebase, however, I don't
know how I should communicate that clearly, so I'm sending this as RFC
to avoid any possible merging issues. It's not really an RFC, and in
reality this is not v1, but the end result of many iterations, simply
rebased on top of Junio's changes.

While updating the documentation (yet again) I noticed it didn't follow
from one paragraph to the next (not a good story). So I decided to
rewrite it adding a lot more detail.

The warning has also been changed completely taking into consideration
the imput Jeff King shared with us in 2013 from GitHub trainers.

And finally one low-hanging fruit patch.

I have many more in the queue though.


Felipe Contreras (3):
  doc: pull: explain what is a fast-forward
  pull: improve default warning
  pull: cleanup autostash check

 Documentation/git-pull.txt | 38 +++++++++++++++++++++++++++++++++-----
 builtin/pull.c             | 38 +++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 24 deletions(-)