2020-08-16T06:30:01Z

1 files changed, 13 insertions, 0 deletions

diff --git a/mv.txt b/mv.txt
index 2b0e78c46612..303c99f79fcd 100644
--- a/mv.txt
+++ b/mv.txt
@@ -16,6 +16,19 @@
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}],
  'status': 'unofficial'}
 $ pmaint sync mv
+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 mv
 *** synced mv