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. Since v1 I removed one line of advice because now a second person--Alex Henrie--objected to it. The line is still useful, but can be added later. [1] https://lore.kernel.org/git/20201218211026.1937168-1-felipe.contreras@xxxxxxxxx/ Felipe Contreras (2): doc: pull: explain what is a fast-forward pull: improve default warning Documentation/git-pull.txt | 41 ++++++++++++++++++++++++++++++++------ builtin/pull.c | 21 +++++++++---------- 2 files changed, 46 insertions(+), 16 deletions(-) Range-diff against v1: 1: 949e814b27 = 1: 949e814b27 doc: pull: explain what is a fast-forward 2: 8a72fa35ef ! 2: cfb60a24d6 pull: improve default warning @@ builtin/pull.c: static int get_can_ff(struct object_id *orig_head, struct object + " git config --global pull.rebase true # rebase\n" + " git config --global pull.ff only # fast-forward only\n" + "\n" -+ "If unsure, run \"git pull --no-rebase\".\n" + "Read \"git pull --help\" for more information.")); } -- 2.32.0
