1 files changed, 13 insertions, 0 deletions
diff --git a/lisp.txt b/lisp.txt
index 340b7ca6e452..4226e48a769d 100644
--- a/lisp.txt
+++ b/lisp.txt
@@ -14,6 +14,19 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/lisp.git'}],
  'status': 'official'}
 $ pmaint sync lisp
+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.
+
 Already up to date.
 *** syncing lisp
 *** synced lisp