diff options
Diffstat (limited to 'aeon-gentoo-overlay.txt')
| -rw-r--r-- | aeon-gentoo-overlay.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/aeon-gentoo-overlay.txt b/aeon-gentoo-overlay.txt index e63da8c6ae6a..3ab9b5491502 100644 --- a/aeon-gentoo-overlay.txt +++ b/aeon-gentoo-overlay.txt @@ -11,18 +11,22 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync aeon-gentoo-overlay -WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing aeon-gentoo-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/aeon-gentoo-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: + + git config pull.rebase false # merge (the default strategy) + git config pull.rebase true # rebase + git config pull.ff only # fast-forward only + +You can replace "git config" with "git config --global" to set a default +preference for all repositories. You can also pass --rebase, --no-rebase, +or --ff-only on the command line to override the configured default per +invocation. + +Already up to date. *** synced aeon-gentoo-overlay * Sync succeeded $ git log --format=%ci -1 |