diff options
author | 2021-03-15 22:07:49 +0000 | |
---|---|---|
committer | 2021-03-15 22:07:49 +0000 | |
commit | 3ece0325dd53a4997b6c9886ac65bce93e575c55 (patch) | |
tree | 0671e02a2b0614613da31ed0196302aee150add3 /hibiscus.txt | |
parent | 2021-03-15T21:30:01Z (diff) | |
download | repos-3ece0325dd53a4997b6c9886ac65bce93e575c55.tar.gz repos-3ece0325dd53a4997b6c9886ac65bce93e575c55.tar.bz2 repos-3ece0325dd53a4997b6c9886ac65bce93e575c55.zip |
2021-03-15T22:00:01Z
Diffstat (limited to 'hibiscus.txt')
-rw-r--r-- | hibiscus.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hibiscus.txt b/hibiscus.txt index a1ad059f1817..516323ebca69 100644 --- a/hibiscus.txt +++ b/hibiscus.txt @@ -14,7 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/hibiscus.git'}], 'status': 'unofficial'} $ pmaint sync hibiscus -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). +*** syncing hibiscus 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 hibiscus *** synced hibiscus * Sync succeeded $ git log --format=%ci -1 |