diff options
Diffstat (limited to 'miramir.txt')
| -rw-r--r-- | miramir.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/miramir.txt b/miramir.txt index 0eb05efc2fe1..5f94b2823262 100644 --- a/miramir.txt +++ b/miramir.txt @@ -8,8 +8,8 @@ 'uri': 'https://github.com/miramir/miramir-layman.git'}], 'status': 'unofficial'} $ pmaint sync miramir -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 miramir 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: @@ -24,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing miramir *** synced miramir * Sync succeeded $ git log --format=%ci -1 |