2021-03-31T13:15:01Z

1 files changed, 14 insertions, 5 deletions

diff --git a/JRG.txt b/JRG.txt
index 52a60191e6c6..9e1eab233fbe 100644
--- a/JRG.txt
+++ b/JRG.txt
@@ -13,13 +13,22 @@
             {'type': 'git',
              'uri': 'git@github.com:john-r-graham/jrg-overlay.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync JRG
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing JRG
-Cloning into '/var/lib/repo-mirror-ci/sync/JRG'...
+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 JRG
  * Sync succeeded
 $ git log --format=%ci -1