diff options
Diffstat (limited to 'src_prepare-overlay.txt')
| -rw-r--r-- | src_prepare-overlay.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt index 4c12801783a5..245b8f8aafc7 100644 --- a/src_prepare-overlay.txt +++ b/src_prepare-overlay.txt @@ -11,6 +11,7 @@ 'status': 'unofficial'} $ pmaint sync src_prepare-overlay 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 src_prepare-overlay 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: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing src_prepare-overlay *** synced src_prepare-overlay * Sync succeeded $ git log --format=%ci -1 |