From e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b Mon Sep 17 00:00:00 2001
From: Repository mirror & CI <repomirrorci@gentoo.org>
Date: Sun, 16 Aug 2020 06:35:42 +0000
Subject: 2020-08-16T06:30:01Z

---
 fowlay.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'fowlay.txt')

diff --git a/fowlay.txt b/fowlay.txt
index 9fea9ffdee3e..b42e3b4f83a6 100644
--- a/fowlay.txt
+++ b/fowlay.txt
@@ -10,6 +10,19 @@
              'uri': 'https://github.com/fowlay/fowlay-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fowlay
+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 fowlay
 *** synced fowlay
-- 
cgit v1.2.3-65-gdbad