From eba5a45148857b729b8fd03c9d456808f8652b0a Mon Sep 17 00:00:00 2001
From: Repository mirror & CI <repomirrorci@gentoo.org>
Date: Fri, 23 Apr 2021 14:19:55 +0000
Subject: 2021-04-23T14:15:01Z

---
 zGentoo.txt | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'zGentoo.txt')

diff --git a/zGentoo.txt b/zGentoo.txt
index cbaedffb993c..ac9ae1844a72 100644
--- a/zGentoo.txt
+++ b/zGentoo.txt
@@ -10,10 +10,22 @@
              'uri': 'https://lab.retarded.farm/zappel/zGentoo.git'},
             {'type': 'git', 'uri': 'git@lab.retarded.farm:zappel/zGentoo.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync zGentoo
 *** syncing zGentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/zGentoo'...
+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.
 *** synced zGentoo
  * Sync succeeded
 $ git log --format=%ci -1
-- 
cgit v1.2.3-65-gdbad