From dda7b590877b5194f6eb424cf22651903a36f53e Mon Sep 17 00:00:00 2001
From: Repository mirror & CI <repomirrorci@gentoo.org>
Date: Sun, 13 Sep 2020 10:35:10 +0000
Subject: 2020-09-13T10:30:01Z

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

(limited to 'gitlab.txt')

diff --git a/gitlab.txt b/gitlab.txt
index 13519e3e6150..6e8aed52fbf4 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -8,9 +8,21 @@
  'source': [{'type': 'git',
              'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync gitlab
-Cloning into '/var/lib/repo-mirror-ci/sync/gitlab'...
+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 gitlab
 *** synced gitlab
  * Sync succeeded
-- 
cgit v1.2.3-65-gdbad