1 files changed, 13 insertions, 0 deletions
diff --git a/fol4.txt b/fol4.txt
index 681929aca4de..57cd3bc24e87 100644
--- a/fol4.txt
+++ b/fol4.txt
@@ -8,6 +8,19 @@
             {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/madsl/fol4.git'}],
  'status': 'unofficial'}
 $ pmaint sync fol4
+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
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
 warning: redirecting to https://gitlab.com/madsl/fol4.git/
 Already up to date.
 *** syncing fol4