diff options
Diffstat (limited to 'haarp.txt')
-rw-r--r-- | haarp.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/haarp.txt b/haarp.txt index 6c9e7467a95d..16a23177a90a 100644 --- a/haarp.txt +++ b/haarp.txt @@ -8,7 +8,7 @@ 'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}], 'status': 'unofficial'} $ pmaint sync haarp -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 haarp 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: @@ -23,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing haarp *** synced haarp * Sync succeeded $ git log --format=%ci -1 |