summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'johu.txt')
-rw-r--r--johu.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/johu.txt b/johu.txt
index 43b54ad51e9c..1a801d721a88 100644
--- a/johu.txt
+++ b/johu.txt
@@ -13,8 +13,8 @@
'uri': 'git+ssh://git@git.gentoo.org/dev/johu.git'}],
'status': 'official'}
$ pmaint sync johu
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+*** syncing johu
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:
@@ -29,7 +29,6 @@ or --ff-only on the command line to override the configured default per
invocation.
Already up to date.
-*** syncing johu
*** synced johu
* Sync succeeded
$ git log --format=%ci -1