commit 51cb2a6018a9c8f827e16ea33f03fdf13381f677 Author: Aaron LI <a...@aaronly.me> Date: Sat Aug 1 14:34:55 2020 +0800
Makefile.usr: Add '--ff-only' to 'git pull' Since version 2.27, Git will warn the pulling if not specified how to reconcile divergent branch: warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only As a result, users may come into this issue when doing 'make src-update' or 'make dports-update' tasks and need to resolve the 'git pull' manually. Add the '--ff-only' (i.e., fast-forward only, which is the safest) to the 'git pull' command. While there, adjust the update automation note and show it in 'src-update' and 'dports-update' tasks. Credit: https://stackoverflow.com/a/62653400 Mentioned-by: noob237 (Gonzalo Nemmi) Summary of changes: etc/Makefile.usr | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/51cb2a6018a9c8f827e16ea33f03fdf13381f677 -- DragonFly BSD source repository