This is an attempt to revive the old patch series [1]. Since v7 of the series the pull.mode configuration is added, and the warning has been updated to make use of that. What is missing from the old series is: * Add git pull --merge * Actually change the default to ff-only Cheers. [1] https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@xxxxxxxxx/ Felipe Contreras (10): pull: refactor fast-forward check pull: cleanup autostash check pull: trivial cleanup pull: move default warning pull: display default warning only when non-ff test: pull-options: revert unnecessary changes rebase: add REBASE_DEFAULT pull: add pull.mode pull: add pull.mode=ff-only pull: improve default warning Documentation/config/branch.txt | 6 ++ Documentation/config/pull.txt | 6 ++ Documentation/git-pull.txt | 17 ++++ builtin/pull.c | 146 ++++++++++++++++++++++---------- builtin/remote.c | 22 ++++- rebase.c | 12 +++ rebase.h | 13 ++- t/t5520-pull.sh | 92 ++++++++++++++++++++ t/t5521-pull-options.sh | 22 ++--- t/t7601-merge-pull-config.sh | 49 ++++------- 10 files changed, 297 insertions(+), 88 deletions(-) -- 2.29.2
