diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-13 20:19:00 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-13 20:19:00 +0000 |
| commit | 7dbb6da484c54e09f2bfc9436d2bc31866a055a1 (patch) | |
| tree | 23a0b020e12de3a916ab53aac306e742da34f14e /lanodanOverlay.txt | |
| parent | 2021-01-13T19:30:01Z (diff) | |
| download | repos-7dbb6da484c54e09f2bfc9436d2bc31866a055a1.tar.gz repos-7dbb6da484c54e09f2bfc9436d2bc31866a055a1.tar.bz2 repos-7dbb6da484c54e09f2bfc9436d2bc31866a055a1.zip | |
2021-01-13T20:00:01Z
Diffstat (limited to 'lanodanOverlay.txt')
| -rw-r--r-- | lanodanOverlay.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index a2cda70c3035..0a4245c79427 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -14,11 +14,21 @@ {'type': 'git', 'uri': 'git://hacktivis.me/git/overlay.git'}, {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync lanodanOverlay -WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'... +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. *** syncing lanodanOverlay *** synced lanodanOverlay * Sync succeeded |